first commit -from development
pushed from server
Merge branch 'development'

Conflicts:
	app/controllers/customers_controller.rb
	app/views/customers/index.html.erb