fixing bugs
Merge branch 'master' of github.com:jdeslangles/project3