møkka comment
c
Merge branch 'master' of https://github.com/RepublicOfProgrammers/polakken
Merge branch 'Morten'

Conflicts:
	Polakken/obj/x86/Debug/Polakken.csproj.FileListAbsolute.txt
	Polakken/obj/x86/Debug/Polakken.pdb
Merge branch 'master' of https://github.com/RepublicOfProgrammers/polakken

Conflicts:
	Polakken/SensorCom.cs
	Republic of Programmers.suo
Merge branch 'master' of https://github.com/RepublicOfProgrammers/polakken

Conflicts:
	Polakken/SensorCom.cs
	Republic of Programmers.suo
Merge branch 'master' of https://github.com/RepublicOfProgrammers/polakken

Conflicts:
	Polakken/Properties/Settings.Designer.cs