commit
Merge branch 'master' of https://github.com/Jeff-Shim/InternetProgrammingProject3

Conflicts:
	index.html
Merge branch 'master' of https://github.com/Jeff-Shim/InternetProgrammingProject3