version 2.1
Merge branch 'master' of https://github.com/Flo354/Androick

Conflicts:
	README.md