#31 changed adding bitcoin address to order flow
Merge branch 'master' of github.com:godot/pasher

Conflicts:
	app/models/order.rb