Merge branch 'master' of https://github.com/bibah94/gesprocess

Conflicts:
	src/rr.c
	src/sjf.c
Merge branch 'master' of https://github.com/bibah94/gesprocess

Conflicts:
	src/sjf.c