start of homework 5
Merge branch 'master' of github.com:sythryan/ArchitectureClass