test
Merge branch 'master' of http://github.com/eddyzags/42sh

Conflicts:
	src/42sh.c
Merge branch 'master' of http://github.com/eddyzags/42sh
history