first commit to my repo
Merge branch 'master' of github.com:gjm97/pyethereum_stake

Conflicts:
	.gitignore