trying to fix git merge fail with reset #35
Merge branch 'issue35' of https://github.com/Prosjekt2-09arduino/ArduinoStore into issue35