Project 1 mostly finished, transferring work over to MBP
Merge branch 'master' of github.com:bawjensen/CompOrg