starting branch to merge with maps
getting ready to merge
pushing for christina to pull
preview photo working, fixed styling
small style changes to image preview
almost have profile pages working
commit to merge
Change a bit the controller to fit a more standard approach
Merge remote-tracking branch 'origin/image_profile_radio' into image_profile
pushing to merge
Merge branch 'master' into image_profile

Conflicts:
	.env
	app/assets/stylesheets/images.css.scss
	app/controllers/users_controller.rb
	app/models/user.rb
	app/uploaders/image_uploader.rb
	app/views/images/new.html.erb