change
Merge branch 'master' into change

Conflicts:
	README.md
Merge pull request #81 from theFirehoseProject/change

change