Added all files to merge with big computer