Hellings breytingar search

search
Merge branch 'master' of https://github.com/RoyalCookie/VerklegtVerkefni3

Conflicts:
	VerklegtVerkefni3.pro.user
	mainwindow.h
	mainwindow.ui
Merge branch 'master' of https://github.com/RoyalCookie/VerklegtVerkefni3

Conflicts:
	VerklegtVerkefni3.pro.user
	mainwindow.h
	mainwindow.ui