buffer overflow lab
Merge branch 'lab'

Conflicts:
	src/shell.c
Merge branch 'master' into lab