styling updates
Navbar finalized.  About and Contact pages added
Merge pull request #35 from SalamanderMike/master

Refactor & Debug
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 git://github.com/TeamGlorious/explorify
Jesse Merge
Conflicts:
	app/views/trips/show.html.erb
jQuery