Code or vm not working. Pushing to test on another machine.
Merge branches 'master', 'master' and 'master' of https://github.com/zenelk/OSProject3

Conflicts:
	servers/sched/main.c