kaleb's a comma weirdo.
Merge branch 'master' of https://github.com/4771cu5/cosc1436

Conflicts:
	meow.cpp