*
Merge branch 'master' of https://github.com/pmaanen/gammagamma

Conflicts:
	scripts/test_gun.mac
preparing to merge
Merge branch 'master' of https://github.com/pmaanen/gammagamma

Conflicts:
	src/DetectorConstruction.cc