bases
base
Merged?
Merge branch 'master' of https://github.com/miquelarranz/PES.git

Conflicts:
	Borsa/web/stylesheet.css
Merge branch 'master' of https://github.com/miquelarranz/PES.git
Arreglos i Login