add flickraw to gemfile
add dotenv gem
api key should not be pushed to repo
resolve merge conflicts