latest commits

these are all the latest commits since the last commit and merge