Merge branch 'master' of github.com:joshuakemp1/farrier_app_2

Conflicts:
	app/controllers/clients_controller.rb
	app/views/clients/_form.html.erb
	app/views/clients/index.html.erb
	app/views/clients/show.html.erb
	db/schema.rb
	public/uploads/client/picture/22/girl_eyes.jpeg
	public/uploads/client/picture/23/hawk.jpg