final commit. all files from different machines integrated