Merge remote-tracking branch 'upstream/master'

Conflicts:
	.DS_Store
	week-02/.DS_Store
week 4 map
Merge pull request #39 from alisonsexton/master

week 4