Edited readme
Merge branch 'master' of https://github.com/JensenCampus/hello

Conflicts:
	README.md