Commit prova
Revert "Commit prova"

This reverts commit 0b428fe10e13b66d2507ed067535458182c0634f.
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
commit 2

Cambis petits
Neteja
Neteja Feta
Modificat gitignore
Prova
Prova2
Prova3
Prova funcionament gitignore
Merge remote-tracking branch 'origin/Arnau' into Ricard

Conflicts:
	.gitignore
	nbproject/private/private.xml
	src/inicirobot/Robot1.java
Merge fet, projecte funcionant,. Robot 1 modificat
Maleits fitxers de configuracio
Camuflatge militar robot1
Noms de funcions etc en angles