message views refactored
Merge branch 'messages'
conversations controller and views
Merge branch 'master' of github.com:fredmcgroarty/language_learning_project
Merge branch 'messages'