*Prevented Server from running too fast
*Player modified
Merge branch 'master' of https://github.com/ILikePizza555/bullets-grenades

Conflicts:
	bin/shared/Player.class