moving things around
Merge branch 'master' of github.com:StefanKjartansson/stadfangaskra-rest