finished week7
Actually done this time I hope
Done
Merge pull request #1 from josephdougs/master

Merge ours and then do the official pull request to turn in