s3 uploads, some controller arrangement, routing
Merge branch 'master' of https://github.com/janetchang/wodlandia

Conflicts:
	app/views/users/new.html.erb
	config/routes.rb
	db/schema.rb