week 3 slides, week2 solutions
week3 homework
added sample files for hw3
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore