pseudocode for merge
Merge branch 'master' of github.com:MJMortimer/361Skyline