Updated settings.
Merge branch 'master' of https://github.com/CS147Project/WebApp

Conflicts:
	routes/team.js
	views/settings.handlebars
Merge branch 'master' of https://github.com/CS147Project/WebApp