Fixed variable declarations
Merge branch 'master' of https://github.com/demonicblue/operating-systems

Conflicts:
	lab2/concurrent_queue_2locks.c