commit 2:53pm 10/17 from hotfix
Merge branch 'hotfix' into develop
merged
Conflicts:
	README.md