Week 3 commit

Merging for week 3