init
Merge branch 'master' of github.com:mixfx/thingx

Conflicts:
	.gitignore