gathering
Merge branch 'master' of https://github.com/chelmes/SLapH_EigSys

Conflicts:
	include/parastruct.h