a
Merge branch 'master' of https://github.com/shhaky/gds_project

Conflicts:
	First Ver/First Ver/BitCoin/BitCoin.v11.suo