Working on final project
Merge branch 'master' of github.com:bawjensen/CompOrg