Merge branch 'master' of https://github.com/TriValleyCoderDojo/beginner-web

Conflicts:
	session1/01-getting_started/README.md