added paperclip gem, env & gitignore files and setup all AWS, devise keys to prepare for heroku config setup
change
fixed untracked files
changed all env keys and prepped for paperclip
added feeds controller, views, routes, view
resolving conflict
trying to resolve conflict and merge