Made compiler work!
Solved some conflicts as well

Conflicts:
	dsh.c
	dsh.log