Merge branch 'new_matching' of gitlab.ift.uam-csic.es:Conigli/gevp-automated-analysis into new_matching

# Conflicts:
#	src/gevp.jl