login and session functionality now supported for the most part. app.js and routes/user.js updated accordingly, with small update to template view and style
Merge branch 'master' of https://github.com/marcochiang/CMPSCI326

Conflicts:
	views/template.ejs
Merge branch 'master' of https://github.com/marcochiang/CMPSCI326

Conflicts:
	views/template.ejs