d
sd
Merge branch 'master' of https://github.com/dvikan/gamle-ntnu-eksamener
Merge branch 'master' of https://github.com/dvikan/gamle-ntnu-eksamener
Merge branch 'master' of https://github.com/dvikan/gamle-ntnu-eksamener
Merge branch 'master' of https://github.com/dvikan/gamle-ntnu-eksamener

Conflicts:
	README.txt
Merge branch 'master' of https://github.com/dvikan/gamle-ntnu-eksamener