Merge pull request #18 from Elwend/master

Pull request from Liz
Merge branch 'master' of github.com:pmills88/Project-2
Added messaging.rb model