no message
Merge branch 'master' of https://github.com/gareth-cross/pumadance

Conflicts:
	timerFunction.m