yo
Merge branch 'master' of https://github.com/sodabeta7/AndroidProject

Conflicts:
	README.md