Shawn css changes
Merge pull request #22 from MooreJesseB/master

minor tweaks after addition of new styles
Merge branch 'master' of git://github.com/TeamGlorious/explorify

Jesse Minor tweeks to css
Merge pull request #23 from MooreJesseB/master

Restore landing page.  Bug fixes to trip creation.  Only location tagged...
Balloon Marker
Merge branch 'master' of git://github.com/TeamGlorious/explorify
Jesse Tweek
Merge pull request #24 from SalamanderMike/master

Balloon Markers
root fixed
working on merge issues
duplicate p tags solved
Merge pull request #26 from sbokaie/master

Merge issue should be solved
Merge branch 'master' of github.com:TeamGlorious/explorify

recursive merge resolved