Merge branch 'master' of git@github.com:horrovac/jkutop

Conflicts:
	printing.c
Merge branch 'master' of git@github.com:horrovac/jkutop

Conflicts:
	printing.c