Almost done
Merge branch 'master' of http://github.com/dsuryakusuma/HackJam2014