updating
updating
Merge branch 'master' of https://github.com/bicyclerace/bicyclerace.github.io
Merge remote-tracking branch 'origin/master'
prepping for merge