merge

Conflicts:
compress/team1/makefile