bp5
Merge branch 'master' of
https://github.com/HazelChen/treasuryArbitrage.git

Conflicts:
	treasuryArbitrage/src/edu/nju/treasuryArbitrage/network/DataInterface.java
	treasuryArbitrage/src/edu/nju/treasuryArbitrage/network/DataInterfacePile.java
Merge branch 'master' of https://github.com/HazelChen/treasuryArbitrage.git
bp6
Merge branch 'master' of
https://github.com/HazelChen/treasuryArbitrage.git

Conflicts:
	treasuryArbitrage/src/edu/nju/treasuryArbitrage/network/DataInterface.java
Merge branch 'master' of
https://github.com/HazelChen/treasuryArbitrage.git

Conflicts:
	treasuryArbitrage/src/edu/nju/treasuryArbitrage/PersonalCenter/PersonalInfo.java