Merging the ProjectNinja 9-17 folder with what we have in git