Gitlol
Merge branch 'master' of github.com:ekkodill/jalla

Conflicts:
	print.php