ok

Change-Id: I20d18aa523224b144d4f57ab87f4ae5a2be4df45
Merge branch 'master' of https://github.com/fsuhrau/mohbot

Conflicts:
	Arduino/mohbot.ino

Change-Id: I95d224e762fb1569a9dfe0b46a50afa80d26eefb