Add max waiting time for global_lock.h
Merge branch 'master' of https://github.com/mpastyl/queues_new_repo
Merge branch 'master' of https://github.com/mpastyl/queues_new_repo

Conflicts:
	global_lock.h
	parallel_benchmarks.c
Changed all need to make hybrid pass test
Ok fc_hybrid passed