cleanup
Merge branch 'master' of https://github.com/dalejin/codecamp
clean up take 2