upd
Merge branch 'dev' of github.com:FreeCX/pixel-story into dev

Conflicts:
	code/Makefile