created message controller tests
changed controller spec
resolved merge conflict
completed twillio specs
Merge branch 'development' of https://github.com/SamSamskies/wezolo into twillio