Initial commit
Merge branch 'master' of https://github.com/timkb4cq/mx-user

Conflicts:
	LICENSE