satt in text i prosjektrapport
Merge branch 'master' of https://github.com/Temestokles/gruppeweb

Conflicts:
	prosjektrapport.html
prøver litt endringer
endret litt feil