Map generation
Merge branch 'master' of https://github.com/gil-naamani/GameJam2014
Working movement, camera, color grabs