CtrlDomini
Merge branch 'master' of https://github.com/hersftw/prop

Conflicts:
	bin/prop/domini/Conica.class
	bin/prop/domini/Lineal.class
	bin/prop/domini/Llibreria.class
Drivers Llibre(no provat)
Commit
Mogut DriverCtrlDomini
Merge branch 'master' of https://github.com/hersftw/prop

Conflicts:
	bin/.gitignore
	bin/prop/ctrldomini/CtrlDomini.class
	bin/prop/domini/Llibre.class
Drivers Categoria (Funional)
Més commit
Merge branch 'master' of https://github.com/hersftw/prop

Conflicts:
	bin/prop/ctrldomini/CtrlDomini.class
Ctrl
Gitignore indanight
Merge branch 'master' of https://github.com/hersftw/prop