update of color parallel done
merge makefile