End of Day 1
Merge branch 'master' of https://github.com/rfahsel3/hw4