prestonController
organization
more changes
finally
Merge branch 'prestonController' into carefulmerge

Conflicts:
	.DS_Store
	app/.DS_Store
	app/controllers/application_controller.rb
	app/views/devise/registrations/read.html.erb
	config/routes.rb
merge conflicts
newest merge
search engine