commit update
Merge branch 'master' of github.com:Voluntarynet/Bitmarkets

Conflicts:
	commit.sh