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

Conflicts:
	print.php

Signed-off-by: ekkodill <rambo89@gmail.com>
Merge branch 'master' of github.com:ekkodill/jalla

Conflicts:
	oppgave.php
	print.php