add thread1
Merge origin/master

Conflicts:
	lab1_thread_mutex.c