HP6
HP6
Merge branch 'master' of github.com:satyathakkar/Pha

Conflicts:
	app/controllers/users_controller.rb
	app/views/healer_profiles/show.html.erb
	spec/requests/healer_profiles_pages_spec.rb
	spec/requests/users_spec.rb