not important commit
Merge branch 'master' of https://github.com/hrm8/Devil-Shell

Conflicts:
	dsh
	dsh.c
	dsh.dSYM/Contents/Resources/DWARF/dsh