Started aoe.  Minor bugs left
Finished AOE
Fixed strange vs file bug.  Merging Scott's changes into master
Merging a few VS changes so that I can switch branches
Updating origin Scott branch
Implemented several screens including main menu, town, level, game over, and pause screens.
Cleaned up code and deleted some unnecessary files
Added statuses to all actions and added status capabilities to the BattleController.
Fixed bugs with status.
Merged changes.
Last commit before sprint 3 merge
Merging with Andrew's changes..
Merging again...
Prepared to merge.
Fixed issue with statuses not updating every level.
Added defend action and finalized logic for status effects.
Added stat effects to turn by turn statuses.
Added some more screens and did more typing
Merged (finally) with Andrew's changes