dis is a msg
Merge branch 'master' of github.com:ronmeir/crypto_bond

Conflicts:
	foo.txt