Cleaned up menu code a little bit, still work in progress...
Merge branch 'master' of https://github.com/mitch3a/SuperMarioWar