Sheri's initial commit
Merge branch 'master' into sheri_branch

Conflicts:
	readme.md
Merge branch 'sheri_branch'