commit 2
Merge branch 'master' of https://github.com/mattmarquard/310assign1