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 pull request #44 from ShirajG/master

Add Form validations and limit inputs for certain fields
Merge branch 'master' of https://github.com/jcsalaza/puppy-love

Conflicts:
	Gemfile
	Gemfile.lock
gemfile lock merge conflict resolved
Increase number of dogs shown on Index
Add age method to be implemented later
Update Dog#index view
Add styling to Dog-Index
Merge pull request #45 from nickgio/dog-index-view

Dog index view
Six passing tests for the messages controller
Merge pull request #46 from jcsalaza/another_message_test_branch

Another message test branch
Merge pull request #47 from ShirajG/master

Style the profiles to look a little better