robooooots
Merge remote-tracking branch 'origin/ArnauArrayDeveloping' into RicardArrayDeveloping
carregar fitxers
llistat funcionant
Boto afegir robot a la lista en menu
asdf
Menu principal correctamenet fet
falta cast de String a object
Menu principal que no m'agrada
Merge remote-tracking branch 'origin/ArnauArrayDeveloping' into mergecomplicat

Conflicts:
	src/resources/robots/Robot1.java
	src/resources/robots/Robot2.java
Commit
Boton all
PreMerge
Merge remote-tracking branch 'origin/RicardArrayDeveloping' into ArnauArrayDeveloping