cleaned up
Merge branch 'master' of https://github.com/AzizHarrington/cs253