Update README.md
Merge branch 'develop'

Conflicts:
	README.md
Fixed README.md formating issues
Merge branch 'master' into develop