a
a
Merge branch 'master' of https://github.com/ianchildress/coinswap-arbitrage

Conflicts:
	coinswap.go
added cryptsy.go