Map Marker image and SOC
Merge pull request #1 from MooreJesseB/master

Major screw up.  This pull request restores everything before I messed it up.
Drawing lines between markers
Merge pull request #1 from MooreJesseB/master

Add OAuth for Instagram
Merge branch 'master' of git://github.com/TeamGlorious/explorify
group merge
Add media model
Merging with new repo
Merge pull request #2 from SalamanderMike/master

Merge map changes with new repo
add trip model
Merge branch 'master' of github.com:TeamGlorious/explorify

Merge conflict resolved