Changes prior to commit
Merge branch 'master' of https://github.com/ptolemybarnes/BorisBikes