syncing things
Merge branch 'master' of https://github.com/rbrt/gamejam2014
Better level assembled