Updated docs.
Merge branch 'master' of https://github.com/CS147Project/WebApp

Conflicts:
	.DS_Store