icon + stuff
Merge branch 'master' of github.com:CaffeinatedDave/BattleHack