Second bootstrap assignment, week 5
Merge branch 'master' of https://github.com/margiecalvert/Prog270-Calvert