Week4 part2

Finished week4 part2.  I had originally pushed updates to master as I was going along since I was deploying to heroku from master.  So I did a hard reset of master so that I could generate this pull request.  Hopefully this will all still work