fixed conflicts
Merge branch 'Danny' of https://github.com/GetzChris/CS314 into Danny