rerun part d to fill in range(1,16)
Merge conflicts again...
Merge branch 'master' of https://github.com/jming/spring2013