week 7

week 7
Sample final project
week 7

week 7
week 7

week 7
Merge remote-tracking branch 'ada-linda/master'

Conflicts:
	week-07/tennant-calvin/index.html