rofl
Merge branch 'master' of https://github.com/markusmo/epicminic

Conflicts:
	printer.c~