README.md edited online with Bitbucket
Merge branch 'origin/master'

Conflicts:
	README.md
README Fix After Conflict