auka virkni a filter virkar ekki alveg
Merge branch 'master' of https://github.com/bjornlogi/Lokaverkefni

Conflicts:
	js/sliderAndFiltering.js