clock
Modified .gitignore
Merge branch 'master' of github.com:mludtke/cs559p3

Conflicts:
	Moshball.vcxproj
	Moshball.vcxproj.filters