hasn't been compiled
Merge branch 'master' of github.com:skysmith112/project4

Conflicts:
	ball.cpp