Merge branch 'master' of https://github.com/dac-xp/ggj14

Conflicts:
	javascript/level/level1.js
	javascript/scenes/level.js
Resolved Conflicts