Commited 2:52PM
commit readme
Merge branch 'master' of https://github.com/janfritz/WebCamp

Conflicts:
	README.md
commit