Validations and flash messages
Merge conflict resolved
Fix merge conflicts.  Add validations to trip creation
Merge conflicts fixed
Populate user show page
Merge pull request #33 from MooreJesseB/master

Add validations and flash messages to User and Trips controllers