modified:   README.md
Merge branch 'master' of https://github.com/helspont/AndroidProject

Conflicts:
	README.md

	deleted:    README.md