Merge branch 'master' of https://github.com/jjlakin/Boris-Bikes
Merge branch 'master' of https://github.com/ptolemybarnes/BorisBikes