attempted merge
Merge branch 'master' of https://github.com/bplaster/analytics-hw1