merge
Merge branch 'master' of https://github.com/MeesCode/4get
Merge branch 'master' of https://github.com/MeesCode/4get

Conflicts:
	README.md
small fix