revised
Merge branch 'master' of https://github.com/SergiiMiami/BattleHackMiami-2014