needs to test this
Merge branch 'master' of https://github.com/serich6/cycleatlantacapstone