fix conflicts
fix master bug
Merge branch 'master' of github.com:omahacodeschool/twitter-diversity-report
routes update
udpate application flash and notice