2014-09-12
- third commit 
- branch_1, branch_2 merge_ready
2014-09-12
- Sub_NewFunction_BugFix Branch
- branch_1 update, branch_3 create
Merge branch 'Sub_NewFunction_BugFix'

Conflicts:
	GitTest/src/main/java/git/branch_1/Branch_1_test.java
as
Merge branch 'master' of
https://github.com/albothyl/GitHubBranchTest.git

Conflicts:
	GitTest/src/main/java/git/branch_1/Branch_1_test.java