cambios 28-01-2014
Merge branch 'master' of https://github.com/feddu/productos1

Conflicts:
	estilos.css
	fx.js
	index.html