merged with bluetooth branch, and resolved merge conflicts
merged with bluetooth branch, and resolved merge conflicts

Prosjekt2-09arduino/ArduinoStore,Prosjekt2-09arduino/ArduinoStore,Prosjekt2-09arduino/ArduinoStore