fixed compilation errors
Merge branch 'newbranch'
constants
Merge branch 'master' of https://github.com/sciencewiz1/maslab-staff-2013

Conflicts:
	log.txt

yaay