move mrdo on timer
Merge branch 'master' into mrdo_moviment

Conflicts:
	main.c
fix shots
Merge pull request #25 from adrianob/mrdo_moviment

Mrdo moviment