Done, but might need some more checks...
Merge branch 'master' of github.com:eladbs/os-assignment3

Conflicts:
	os-assignment3.c