commit
commit
Merge branch 'master' of https://github.com/crazynammer/bibicoin

Conflicts:
	test.txt
commit