Deleted lots of commented out code
Merge branch 'master' of https://github.com/sunian/smash