Merge branch 'master' of github.com:adjohnson916/rework-no-media

Conflicts:
	README.md
	package.json