Merge remote-tracking branch 'iimarckus/master' into crystal-makefile

Conflicts:
	Makefile
	main.asm