Badge Modal and Bounty Button
clean up code
Merge branch 'master' of https://github.com/ccahillmn/GameIt