ino and  .h files compile
header file compiles
Merge remote-tracking branch 'origin/master'

Conflicts:
	ControlProgram/ControlProgram.ino
	libraries/KarKontroller/KarKontroller.cpp
	libraries/KarKontroller/KarKontroller.h