commit ignore
wow
Ignore nbproject master
Merge remote-tracking branch 'origin/Ricard'

Conflicts:
	src/inicirobot/IniciRobot.java
	src/inicirobot/Robot.java
	src/inicirobot/Robot1.java
	src/inicirobot/Robot2.java
Conf .gitignore i del carpeta nbproject servidor
Merge remote-tracking branch 'origin/Ricard'
Commit comprovació en master
Merge remote-tracking branch 'origin/Ricard' into Arnau
vides
vides
Merge remote-tracking branch 'origin/master' into Arnau

Conflicts:
	src/inicirobot/Robot.java
vides 2
Aha
R1
Mierda