merging
Merge branch 'master' of https://github.com/zack-fisch/hackbikeshare-2014
refactored javascript
Merge branch 'master' of https://github.com/zack-fisch/hackbikeshare-2014