Merge branch 'diskRotor' of https://github.com/RiekertLeibbrandt/marencoCode into diskRotor

Conflicts:
	groundResonanceModel/groundResonanceUDP/groundResonanceUDP/Program.cs