nothing change
Merge branch 'master' of https://github.com/emCOMP/crisis-curation
adding variables for twitter authentication credentials and search keywords to enable live streaming later
Added the configs to the .gitignore
merge conflict
clear code
fix the close button for user_list
Server stuff
Merge branch 'serverbranch' of https://github.com/emCOMP/crisis-curation into serverbranch