new branch01 commit
branch01 commit
branch01 commit
master pull
Merge branch 'master' of https://github.com/soyeongk/test_repository.git
Merge branch 'branch01'

Conflicts:
	git_test/bin/gitTest.class
	git_test/src/gitTest.java