fixed stupid merge fuck up
Merge branch 'master' of github.com:jerold/CI-Project-3