shot
Merge branch 'master' of https://github.com/jakubka/dogdev

Conflicts:
	src/modules/creature.js