Commit prova
Revert "Commit prova"

This reverts commit 0b428fe10e13b66d2507ed067535458182c0634f.
Commit 2

Cambis arnau
Commit 3

Cambis a Robo 1 i Robot2
Merge remote-tracking branch 'origin/Arnau' into Ricard
Modificat .gitignore

Afegits al gitignore:
nbproject/private/private.properties
nbproject/private/private.xml
nbproject/project.properties
Projecte base net
Merge remote-tracking branch 'origin/Ricard'

Conflicts:
	src/inicirobot/Bullet.java
Neteja