stash
Merge branch 'master' of https://github.com/gormur/Hugbunadarverkefni_hv1

Conflicts:
	fjarmal_v2.py