d
Merge branch 'master' of https://github.com/nardgu/Android

Conflicts:
	README.md