fixed up the naming issues
Merge branch 'master' of https://github.com/deadlycrayon/ecs140a-hw2