cambios artbo
Merge branch 'Develop' of https://github.com/hugomarin/artBO into Develop

Conflicts:
	stylesheets/app.css