Readme link to android
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md

Testing the workflow for merging forks from upstream