Merge branch 'master' of /home/chris/devel/ggj2014/ggj2014 with conflicts.
Merge remote-tracking branch 'origin/master'

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

Conflicts:
	src/main.js