Made major change to the Battle Control and view. I added all of the Battle data to the model layer and stored it in game. This allows us to access the battle from other classes easily. It also made it possible for me to get the battle screen to displayed upon entering the battle. The structure of the algorithms did not change just how the data is accessed. 
Also added to the end of the battle the updating of the players stats so that gold, experience, current health, and current spell points are transfered. 

Nathan
Merge origin/master

Conflicts:
	DaenirisTheForgotten/src/byui/CIT260/DaenirisTheForgotten/Control/BattleControl.java
	DaenirisTheForgotten/src/byui/CIT260/DaenirisTheForgotten/Control/MoveChanceControl.java
	DaenirisTheForgotten/src/byui/CIT260/DaenirisTheForgotten/Model/Enemy.java
	DaenirisTheForgotten/src/byui/CIT260/DaenirisTheForgotten/Model/PlayerCharacter.java
	DaenirisTheForgotten/src/byui/CIT260/DaenirisTheForgotten/View/View.java
Joshua,
In this commit I made a big change which is making the getAction() return an int. I wish i would have thought of this earlier, but by adding this we are able to return an 1 to signal that we need to exit the menu without the user being required to enter "Q". So now if you return a 1 on the doaction() function it will exit automatically to the past screen. With this change the game is running smoothly. I made a lot of changes, but it has allowed us to make future additions easier. Contact me if you have any questions. Especially if you have questions about your battle classes. I have mades some changes that look major but really are only changes on where the data is stored. It makes it easier to access it now. It will help for casting spells and has already helped me with the menus. Play the game I was able to level up! it worked great!