Trying again
Merge branch 'master' of https://github.com/dirtshell/smashonline

Trying to get this to work