What did I do?
Merge branch 'master' of https://github.com/eurobotMTR2014/eurobot_os

Conflicts:
	src/main.c
put main