added sidebar, placed map, foot is good, text/icons 50% there
latest version of sidebar fixing boot
need to delete gemfile.lock
Merge branch 'master' of https://github.com/bobolinks-2014/trek_tracker
problem with gemfile.lock
reaaly need to fix this gemfile issue
fixed homepage merge conflict due to redesign
Merge pull request #68 from bobolinks-2014/redesign-homepage

Redesign homepage