Merge branch 'master' into skill_shots
Merge branch 'skill_shots' of github.com:hellochar/the_game_bazaar into skill_shots
Unit now die. What's left is testing and review