merge/replace/add new files to the project.

after this commit we should both be up to date.