Updated README
Merge remote-tracking branch 'origin/Josh'

Conflicts:
	README.md