Fixed flag reset
Merge branch 'master' of https://github.com/lonnelars/heis-prosjekt