Merge pull request #33 from MooreJesseB/master

Add validations and flash messages to User and Trips controllers
styling updates
Refactor & Debug
Merge branch 'master' of git://github.com/TeamGlorious/explorify
Merge Shawn
Conflicts:
	app/controllers/trips_controller.rb
	app/views/trips/show.html.erb
Merge pull request #35 from SalamanderMike/master

Refactor & Debug
Merge branch 'master' of github.com:TeamGlorious/explorify

recursive merge success
login form fixed
yo
Merge pull request #36 from MooreJesseB/master

Navbar finalized.  About and Contact pages added
yo2
yo3
Merge pull request #38 from sbokaie/master

Styling Merge Revised
Merge branch 'master' of github.com:TeamGlorious/explorify

recursive merge conflict
removed binding.prys