api_controller
fixed merge conflict
junk_data_reddit
Merge branch 'master' of github.com:tedwardmah/news-bubble
fixed conflict