first commit
Merge branch 'master' of github.com:richard1122/QR-auth-android

Conflicts:
	.gitignore