a test commit
Update .gitignore

Removing .DS_Store and .idea files
lesson 4
lesson 2 sample solutions
getting latestMerge remote-tracking branch 'upstream/master'
remove borked lesson 4
lesson 04
Merge branch 'master' of https://github.com/generalassembly-studio/CSF_Homework
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
homework