modified the index page
Merge branch 'master' of https://github.com/marcochiang/CMPSCI326
Conflicts:
	views/users/login.ejs
Merge branch 'master' of https://github.com/marcochiang/CMPSCI326