hmm
skjer?
skjer?
Merge branch 'master' of https://github.com/cifffen/heis

Conflicts:
	src/orders/cost.go
	src/orders/cost.go~
	src/orders/orders.go
	src/orders/orders.go~

Ok