breadcrumbs/Non login
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/register.ejs
	views/team.ejs