zut committen
Merge remote-tracking branch 'origin/master'

Conflicts:
	b2ki/your bot/YourBot.suo
mega fix. timeout is verdwenen