added route "comprar/:id"
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/stylesheets/application.css
Improvements in buy process
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app/assets/javascripts/application.js
	app/views/layouts/application.html.erb