edit profile added
edit profile added
Merge branch 'execute'

Conflicts:
	app/views/shared/_navbar.html.erb
	config/routes.rb