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

Conflicts:
	index.js
	login.js