arreglo conflictos
mergeo styles con los arreglos proto1
styles
Merge branch 'brunoBranch' into dev

Conflicts:
	prototipo2/prototipo2-war/src/java/uy/com/mixit/controllers/FileBean.java
	prototipo2/prototipo2-war/src/java/uy/com/mixit/controllers/MixBean.java
	prototipo2/prototipo2-war/src/java/uy/com/mixit/objetos/BD.java