add coding: utf-8
Merge branch 'dev' of github.com:ETsandy/workingspacect into dev

Conflicts:
	readme.txt