fixed answerscontroller bug with params
Added model tests
started controller testing, finished models
finished city controller testing
fixed merge conflicts