Merge pull request #9 from SalamanderMike/master

Fixed map bug
Navbar with routes
Merge pull request #10 from SalamanderMike/master

Moved explorify to trips
Merge pull request #11 from sbokaie/master

Navbar with routes
allow date ranges above seven days
Merge branch 'master' of github.com:TeamGlorious/explorify

Merge Conflict resolved - Recursive strategey
Merge pull request #12 from MooreJesseB/master

Model tweaks to Media - Now allows date ranges above 7 days
Merge branch 'master' of git://github.com/TeamGlorious/explorify
Merge Jesse and Shawn
Update media model
Merge branch 'master' of github.com:TeamGlorious/explorify

merge conflict
Added group merge
Merge pull request #13 from MooreJesseB/master

Update media model
Merge branch 'master' of git://github.com/TeamGlorious/explorify
Group merge
Remove binding.pry
Connect map to trips show
Merge pull request #14 from MooreJesseB/master

Remove binding.pry
Merge branch 'master' of git://github.com/TeamGlorious/explorify
Jesse's Merge
Merge pull request #15 from SalamanderMike/master

Connected trips/show
semicolon
Merge pull request #16 from SalamanderMike/master

semicolon