Merge pull request #3 from Bedunkevich/new_order

new_order
design
fix
fail
Merge remote-tracking branch 'refs/remotes/origin/master' into new_order

Conflicts:
	app/assets/javascripts/order.js
	config/application.rb