Working on projectiles, fixed a few other things
Merge branch 'master' of https://github.com/SyntaxBlitz/apcs-2014-final

Conflicts:
	src/com/timothyaveni/apcsfinal/server/Server.java