god jul
Merge branch 'master' of https://github.com/khallin/cprog14

Conflicts:
	crunch.o
	game.o
	start