This is probably a bad commit. Just sayin'.
Merge branch 'master' of https://github.com/zenelk/OSProject3

Conflicts:
	servers/pm/misc.c
	servers/sched/main.c