commit inicial
Merge branch 'master' of github.com:vierja/logprecios-web

* 'master' of github.com:vierja/logprecios-web:
  Initial commit

Conflicts:
	.gitignore
fix gitignore