maps added to bb
merging conflicts etc
Merge branch 'master' of github.com:cshenoy/bikecheck