locked down activities en friendships
goals on homepage
Merge branch 'master' of github.com:BasBenIk/motivate-me

Conflicts:
	app/views/home/index.html.haml