temp
Merge remote-tracking branch 'origin/master' into Chris
Added MainMenu and transfer to Battle State
Merge Master with my branch
renamed to BattleGUI.lua
Merged Again( I missed one )
And Another Merge
Merge branch 'master' of https://github.com/mkosler/CSCE-443-Project-2
Trying again