Merge branch 'master' of https://github.com/marcochiang/CMPSCI326
Merge branch 'master' of https://github.com/marcochiang/CMPSCI326

Conflicts:
	public/js/main.js
Merge branch 'master' of https://github.com/marcochiang/CMPSCI326