work on upgrade
Soldier attacking Soldier almost working
Merge branch 'gamedesign' of https://github.com/Tadimsky/vooga into gamedesign
Implementing A*
Finished Controller example
Deleted duplicate resource files
why is attacking not working...
modified bullet
Small change
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
path finding merge
upgrade making progress
got attacking to work!
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
yay things DIE NOW!
working soldier death
fixed some bugs, working attack strategy