Don't know if I fixed a bug or not
Merge branch 'merge_skill_shots_and_viewport' of github.com:hellochar/the_game_bazaar into merge_skill_shots_and_viewport