added remove_duplication (string)
Merge branch 'project2' of github.com:Shavakan/cs341 into project2

Conflicts:
	server.c