sma breytingar
Merge branch 'master' of github.com:hronn13/verklegtVerkefni

Conflicts:
	verklegtVerkefni.v12.suo

Signed-off-by: hogniR <hogni@ingimarsson.com>