week3
work stuff
Merge pull request #34 from englishandy/master

work