# Conflicts:
#	inc/Util.h
#	main.c
#	src/ExternButton.cpp
#	src/ServoMotor.cpp
#	src/Util.cpp

# Conflicts:
#	inc/Util.h
#	main.c
#	src/ExternButton.cpp
#	src/ServoMotor.cpp
#	src/Util.cpp

Merge remote-tracking branch 'origin/parametrisierung_and_riddle2' into parametrisierung_and_riddle2

hopefully...