got rid of edited code
Merge branch 'master' of https://github.com/bryce-bowers/CS-48