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

Conflicts:
	package.json
let see if its from git