branch-2-commit ×１
branch-2-commit ×２
branch-commit ×３
branch-commit ×４
Merge branch 'branch-2'

Conflicts:
	app/controllers/Application.java
	app/controllers/Sample1.java