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

Conflicts:
	src/org/my/github/GithubController.java