Best changes ever
Merge branch 'master' of https://github.com/conarfus/2404-project into conarfus-master

Conflicts:
	Makefile