attempt to fix broken commit
Merge branch 'master' of https://github.com/sethicis/cs485proj4LandK