modified bullet
Merge branch 'gamedesign' of https://github.com/Tadimsky/vooga into gamedesign

Conflicts:
	src/vooga/rts/gamedesign/sprite/rtsprite/Bullet.java
Merge branch 'gamedesign' of https://github.com/Tadimsky/vooga into gamedesign
modified a few classes
Merge branch 'gamedesign' of https://github.com/Tadimsky/vooga into gamedesign

Conflicts:
	src/vooga/rts/gamedesign/sprite/rtsprite/RTSprite.java
	src/vooga/rts/gamedesign/sprite/rtsprite/interactive/units/Soldier.java
	src/vooga/rts/gamedesign/strategy/attackstrategy/CanAttack.java
Merge branch 'gamedesign' of https://github.com/Tadimsky/vooga into gamedesign