xp
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/home/order.html.erb