profile page updates including recommendations
Merge branch 'master' of https://github.com/raksonibs/whattodo

Conflicts:
	app/controllers/welcome_controller.rb
	app/views/welcome/index.html.erb