Checkout ok
gitignore public/system
deleting image
Merge branch 'master' of https://github.com/marceluscantus/BH

Conflicts:
	app/assets/stylesheets/style.css
	app/views/admin/glasses/index.html.erb
	app/views/catalog/index.html.erb
	config/routes.rb