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

Messages controller tests
Merge pull request #43 from nickgio/master

Got basic search/filtering working on dogs index
Remove uneccesarry files related to filteriffic
Removed a stray space
Rerun bundler to reflect removal of filteriffic
Merge branch 'master' of github.com:great-horned-owls-2014/puppy-love
Merge in the main dog index for styling work
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
Add validation to new dog form, limit inputs for gender and size.
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
fix bug where select boxes werent properly passing arguments to be created
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
Make the dog profile look a little better