Merge
Merge branch 'master' of https://github.com/unekwu/cs_nemesis

Conflicts:
	cpsc360/l3.c
	cpsc360/test
	cpsc360/test.c
implemented layer 5