trying to get rid of strange changes [ROB]
added run-tumble parameters to example protocol file
conflicts resolved