sorts display of activity feed, adds root
Merge branch 'master' of https://github.com/axchang/health_app

Conflicts:
	app/views/devise/sessions/new.html.erb
	app/views/layouts/application.html.erb
	app/views/pages/home.html.erb
	app/views/requests/index.html.erb
Merged CSS conflicts
Merge branch 'master' of https://github.com/axchang/health_app

Conflicts:
	app/views/requests/index.html.erb