week 6 work in class
Week 7 work in class
Merge remote-tracking branch 'gsus3jo/master'

Conflicts:
	.DS_Store