sh
Merge branch 'master' of https://github.com/kennethfinnesand/is107-gruppe13-bteam

Conflicts:
	prosjektfiler/php/classes/project.php
	prosjektfiler/php/functions/registerproject.php