....
aa

a
Merge branch 'master' of github.com:oraac/ewu-cscd540

Conflicts:
	scheduler.c
some change