Cleaned up stuff
Merge branch 'master' of https://github.com/kentsommer/4061-projects