second commit
Merge branch 'master' of https://github.com/bitwyre/bitwyre-android-wallet

Conflicts:
	README.md