Working on Autocomplete Map Location Search
Merge branch 'master' of git://github.com/TeamGlorious/explorify
Merge Jesse and Shawn
Added group merge
Merge pull request #13 from MooreJesseB/master

Update media model
Merge branch 'master' of git://github.com/TeamGlorious/explorify
Group merge
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
Trip contoller adjustments
Merge branch 'master' of github.com:TeamGlorious/explorify

Resolve recursive merge
populate trips#index with random thumbnails