2key
Merge branch 'master' of https://github.com/iccthedral/craftia

Conflicts:
	createFixtures.js
	src/frontend/main.coffee
	www/js/main.js