stash before pull
Merge branch 'master' of github.com:maxattack/LD29
updates to hero
Merge branch 'master' of github.com:maxattack/LD29