Finished 2.3, still going to work on remaining items on page 30
Merge branch 'master' of https://github.com/nicole28/CMSC345.04-TheAviators