add git file
..

..
Merge branch 'master' of https://github.com/blsalcido/phase_0_unit_2

Conflicts:
	week_6/.DS_Store
	week_6/0_git_started/.DS_Store