^C and ^D now differentiated
Merge branch 'master' of https://github.com/MGM-KTH/shelltacular

Conflicts:
	shell.c