change yml
change yml
change jquery
css changes
hello
removed CSS
tonight testing
Merge branch 'development' of github.com:madness7/GA-Dating-Site into development
reconfig controller
created the associations between the users model and the user_connections model
updated the user controller
interests table
ran rails g uploader UserImage as part of carrier_wave installation
carrier_wave implemented
fixed conflicts
conditional dispaly of image
S3 implmentation. Changes made to uploader files and carrierwave.rb, added ENV to replace specific key values
AWS S3 working for 3 images and using image 1 for profile picture
merge from carrier_wave
changes made as part of last merge conflict