FIX EVERYTHING
Merge branch 'master' of github.com:jaaaaared/battlehack-ios
Merge branch 'master' of github.com:jaaaaared/battlehack-ios