Merge pull request #31 from SalamanderMike/master

Ported trip data into maps
hi
hi2
username description of trip will work now
Validations and flash messages
Merge conflict resolved
Fix merge conflicts.  Add validations to trip creation
Merge pull request #32 from sbokaie/master

Username and journey title + description custom for each trip id
Merge conflicts fixed
Populate user show page
Merge pull request #33 from MooreJesseB/master

Add validations and flash messages to User and Trips controllers
Merge branch 'master' of git://github.com/TeamGlorious/explorify
Merge Shawn
Conflicts:
	app/controllers/trips_controller.rb
	app/views/trips/show.html.erb