a1
HP1
HP2
HP3
HP4
Merge branch 'master' of github.com:satyathakkar/Pha

Conflicts:
	app/assets/stylesheets/custom.css.scss
	app/assets/stylesheets/healer_profiles.css.scss
	app/controllers/healer_profiles_controller.rb
	app/controllers/users_controller.rb
	app/helpers/healer_profiles_helper.rb
	app/models/healer_profile.rb
	app/views/healer_profiles/_form.html.erb
	app/views/healer_profiles/edit.html.erb
	app/views/healer_profiles/index.html.erb
	app/views/healer_profiles/index.json.jbuilder
	app/views/healer_profiles/new.html.erb
	app/views/healer_profiles/show.html.erb
	app/views/healer_profiles/show.json.jbuilder
	app/views/shared/_healer_profile.html.erb
	app/views/users/show.html.erb
	config/routes.rb
	db/schema.rb
	spec/factories/healer_profiles.rb
	spec/models/healer_profile_spec.rb
	spec/requests/healer_profiles_pages_spec.rb
	spec/requests/user_pages_spec.rb
	spec/views/healer_profiles/edit.html.erb_spec.rb
	spec/views/healer_profiles/index.html.erb_spec.rb
	spec/views/healer_profiles/new.html.erb_spec.rb
	spec/views/healer_profiles/show.html.erb_spec.rb