Minor tweaks on homepage
Merge conflict
Merge branch 'master' of github.com:zack-fisch/hackbikeshare-2014