Adding a new method for Branch 1.
Merge branch 'branch_2'

Conflicts:
	src/org/my/github/GithubController.java
Added a new method getSecondBranchName.