final commit

kay wala nay time. hehe
Merge branch 'master' of https://github.com/mguyromelle/GlobalGameJam2014