sploit5
Merge branch 'master' of https://github.com/jcoaster/cs155-project1

Conflicts:
	sploit3.c
Merge branch 'master' of https://github.com/jcoaster/cs155-project1

Conflicts:
	sploit5.c