gitignore y estilos

jh
Merge branch 'master' of github.com:javiermadueno/kaiako

Conflicts:
	app/logs/dev.log
	src/kaiako/StaticBundle/Resources/public/css/estilos.css
	web/bundles/static/css/estilos.css