fixed a bunch of bugs
Merge branch 'master' of https://github.com/nornagon/clickfight