no message
trying things out
removing k
Merge branch 'Jacob' of https://github.com/colonelCasey94/LAB0 into Jack

Conflicts:
	General info.txt