changes including renumbering
Merge branch 'master' of https://github.com/ksevindik/beginning-spring