idk?
Merge branch 'master' of
https://github.com/jbf1001/sticks-and-stones.git

Conflicts:
	Sticks And Stones/src/game/graphics/sprites/Sprite.java
added abstract entity class
added a few more java docs