First commit
Merge https://github.com/maithili2110/cmpe273-lab2

Conflicts:
	index.js
	login.js
First Commit
TODO completed