biohus med engar syningar a timamillibilinu hverfa nuna
Merge branch 'master' of https://github.com/bjornlogi/Lokaverkefni

Conflicts:
	MOVIES.db
	js/lokaverkefni.js