updated some UI and cleaned up some functionality
Merge branch 'master' of https://github.com/twdean/MeleeMe.git