typos
testing
Merge branch 'master' of /home/chris/devel/ggj2014/ggj2014 with conflicts.
testing
lower / uppser scenes
settings, support levels
images divisées par 3
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main.js
settings
buildings
test transition night&day
some more code
and lazy commit message
adding some interactivity
testing collisions
classes
bug fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main.js
size reduced pngs
reuse buildings
reuse buildings