Merge branch 'master' of github.com:ch2ch3/boring-bikes-refresher
Merge branch 'master' of github.com:ch2ch3/boring-bikes-refresher
Merge branch 'master' of github.com:ch2ch3/boring-bikes-refresher
Merge branch 'master' of github.com:ch2ch3/boring-bikes-refresher
Edit CSS
Fixed merge conflicts