lololol
Merge branch 'master' of github.com:simenmm/polarisering

Conflicts:
	rapport.log