modified:   sighandlers.c
Merge branch 'master' of https://github.com/kalifou/tp_mshell

Conflicts:
	mshell
	sighandlers.c

	modified:   Makefile
	modified:   sighandlers.c