First commit
Merge branch 'master' of https://github.com/mojosaurus/mnemonicmajorsystem-android

Conflicts:
	.gitignore