Stuff
Merge branch 'master' into danbranch1

Conflicts:
	README.md