modified the index page
added login.ejs back in
dumb user and lib libraries
Merge branch 'master' of https://github.com/marcochiang/CMPSCI326
Modified the README again
Merge branch 'master' of https://github.com/marcochiang/CMPSCI326
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
Merge branch 'master' of https://github.com/marcochiang/CMPSCI326
Merge branch 'master' of https://github.com/marcochiang/CMPSCI326
Merge branch 'master' of https://github.com/marcochiang/CMPSCI326
Merge branch 'master' of https://github.com/marcochiang/CMPSCI326
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
most of login/register functionality is now complete.
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
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