performance changes
Merge branch 'master' of https://github.com/aaronpfoltzer/LifeteenDatabase

Conflicts:
	.DS_Store
	app/.DS_Store
	app/controllers/contacts_controller.rb
	app/controllers/image_controller.rb
	app/models/contact.rb
	app/views/contacts/index.html.erb
	log/development.log