trying to merge
Merge branch 'master' of https://github.com/dpasillas/CS134_Final

Conflicts:
	projectile.cpp