started adding the profile page.
Merge branch 'master' of https://github.com/TheLoons/SportIM-web

Conflicts:
	app/views/calendar.html
	app/views/home.html
fixed merge issues