clean up
Merge branch 'master' of https://github.com/mberberet/CS564-Phase3