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
added in a very basic oauth for facebook
merged oauth to development
merge of other user
replace roots
merged at monday lunchtime
starting to query for an individual