Mierda
Petades varies
Big Solution
Yeahh
Private
Another big solution
Merge remote-tracking branch 'origin/Arnau' into Ricard

Conflicts:
	.gitignore
	src/inicirobot/Robot.java
	src/inicirobot/Robot1.java
	src/inicirobot/Robot2.java