Starting on the messages controller tests
Merge pull request #1 from jcsalaza/messages_controller_tests

Messages controller tests
Some tests passing for messages controller, but three still are not passing
An extra change to the controller to commit
Merge branch 'master' of https://github.com/great-horned-owls-2014/puppy-love
Merge pull request #2 from jcsalaza/message_controller_test

Message controller test
Merge branch 'master' of https://github.com/jcsalaza/puppy-love

Conflicts:
	Gemfile
	Gemfile.lock
gemfile lock merge conflict resolved
Six passing tests for the messages controller
Merge pull request #46 from jcsalaza/another_message_test_branch

Another message test branch