cleanup
Merge branch 'master' of https://github.com/alanbrady/csc-projects