README update
Merge branch 'master' of https://github.com/steffadams/sample_dev

Conflicts:
	README.md