replaced first line of readme
Merge remote-tracking branch 'origin/master'

Conflicts:
	README
Fixed conflict manually.  Took orgin/master for line one and mine for line two.