push for merge for pull
Merge remote-tracking branch 'upstream/master'

Conflicts:
	main/LapHs
	main/LapHs.cpp
	main/LapHs_2pt.cpp
	modules/GlobalData.cpp
	modules/ReadWrite.cpp