Added heroku gem file
Merge branch 'development'
Merge branch 'development'
Bundled Rails_12factor
Fixed conflicts in Gemfile
Removed duplicate Gemfile
Heroku stuff
Heroku stuff 2
Edited User Info
Merge branch 'master' into development
User profile pic updated
Default profile image uploaded, Error messages put in
Put in S3, fog gem to help with uploading data and photos
Modified seed data, removed file upload
sessions user decopied
Css merge. Kept Beths css and my border
css merge
Css changes
Photo issue resolved