a test commit
lesson 4
lesson 2 sample solutions
remove borked lesson 4
lesson 04
Merge branch 'master' of https://github.com/generalassembly-studio/CSF_Homework
lesson 3
fixed merge conflicts