names branch commit
user can now enter the battle scene, various other menu fixes, cleaned up some global stuff
Merge pull request #1 from sighfin/funtime

Everything up to date and together