second commit
second commit
Merge branch 'master' of https://github.com/btcpar/contest

Conflicts:
	docs/intro.txt
	main.py
Merge branch 'master' of https://github.com/btcpar/contest