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

recursive merge success
Merge branch 'master' of github.com:TeamGlorious/explorify

recursive merge conflict
removed binding.prys
Merge pull request #39 from MooreJesseB/master

Add links to trips/index.  Remove extra binding.pry
Merge branch 'master' of git://github.com/TeamGlorious/explorify
Jesse Merge
last night changes