Adding stuff to README.md
Merge branch 'master' into danbranch1
fixed merge conflict with readme
Conflicts:
	README.md