fix bug
Merge branch 'dev' of github.com:youarehero/youarehero into dev