Readme changes
Okay I think I got this markdown stuff figured out
Merge origin/master

Conflicts:
	README.md