Prepared to merge.
Added logic in the battle controller for floating combat text.
Added more advanced sound to the game and wired them up through a variety of classes.
Added the rest action and a plethora of new sounds.
Added defending into the game as well as started editing artificial intelligence.
Prepared for merge and fixed some issues with invalid actions.
Preparing to merge with Andrew's changes
Merging back with master
Added loading screen used for screens that take time to load their assets