add in main.cc that can be compiled
Merge branch 'master' of https://github.com/jfmrothe/AST523project

Conflicts:
	CHsrc/Data.cc
	CHsrc/Data.h
	CHsrc/main.cc

it seems that samplers.cc does not compile due to some recent changes
from Johannes