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

Conflicts:
	src/DetectorConstruction.cc