formerge
Merge branch 'master' of github.com:mouda/Steven

Conflicts:
	schedule/Makefile
	schedule/simulator
Merge branch 'master' of github.com:mouda/Steven

Conflicts:
	schedule/Makefile
	schedule/simulator
Merge branch 'master' of github.com:mouda/Steven
abstract factory pattern