Update README.md
Merge branch 'develop' #6

Conflicts:
	README.md