.
Merge branch 'master' of https://github.com/j3900/web

Conflicts:
	Project_1/index.html