Resolve everything
Merge branch 'doowon_kang'
Merge branch 'master' of https://github.com/matthewljiang/Curiax_app
Fixing routes