cleaning up
more clean up
Merge branch 'master' of https://github.com/radiofreejohn/codejam