# Conflicts:
#   .gitignore
#   bower.json
#   dashboard-reddit.env.html
#   dashboard-reddit.html
#   demo/elements/news-chart/news-chart.html
#   demo/index.html
#   docker-compose.yml
#   init.sh
#   luigi/analysistask.py
#   luigi/analyzers/emotions.py
#   luigi/analyzers/sentiments.py
#   luigi/scrapers/cnnScraper.py
#   luigi/scrapers/nytimesScraper.py
#   queries.json