Initialize project
Merge branch 'master' of github.com:ddback/meix

Conflicts:
	.gitignore