Merged w/ master
My part no longer crashes \o/
WIP on pathfinding still
Finished pathfinding algorithm
battle system and battle tests
initial battle system and test
EntityType, Stats
Merge branch 'battleSystem' of https://github.com/jackmacattack/GameOfSwords.git into merging

Conflicts:
	GameOfSwords-html/.gwt/.gwt-log
	GameOfSwords/.classpath
Merge branch 'controller' of https://github.com/jackmacattack/GameOfSwords.git into merging

Conflicts:
	GameOfSwords/src/edu/virginia/cs/sgd/controller/Controller.java
	GameOfSwords/src/edu/virginia/cs/sgd/game/model/EntityFactory.java
Merge branch 'entity' of https://github.com/jackmacattack/GameOfSwords.git into merging
Selection
add position manager
click tiles get titles wooo
Merge branch 'controller' into merging

Conflicts:
	GameOfSwords/src/edu/virginia/cs/sgd/game/Level.java
Start of highlighting
Added path highlighting
Fixed texturing bug
Deleted artifacts
yay sprites
Added Death