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