asd
Merge branch 'master' of https://github.com/vitorabner/healthyriver

Conflicts:
	config/routes.rb
Commit
asd
Merge branch 'master' of https://github.com/vitorabner/healthyriver

Conflicts:
	app/views/home/index.html.erb
	app/views/layouts/application.html.erb