more updates
Merge branch 'master' of http://github.com/dougphy/classicalproj

Conflicts:
	main.cpp