Merge remote-tracking branch 'upstream/master'
Fixed exclamation mark on ranged enemy
Unfixed some stuff
Merge pull request #29 from shiyingzheng/master

Fixed some stuff