trying to get rid of strange changes [ROB]
added run-tumble parameters to example protocol file
Merge pull request #56 from roughhawkbit/master

Tidying up
conflicts resolved
conflicts missed
Merge remote-tracking branch 'upstream/master'