update
Signed-off-by: tomasn13 <tomasn13@ru.is>
Merge branch 'newRequest' of github.com:hronn13/verklegtVerkefni into newRequest

Conflicts:
	verklegtVerkefni.v12.suo

Signed-off-by: tomasn13 <tomasn13@ru.is>