Update README.md
Merge branch 'develop'

Conflicts:
	README.md
Merge pull request #5 from jmmaloney4/develop

master
Merge pull request #6 from jmmaloney4/develop

master
Merge pull request #7 from jmmaloney4/master

Master