add image interface (add a new file)
add method1(reword)
add new file
remove new file
add image interface
add image branch file
xxx
commit 1
commit 2
commit 3
Merge branch 'master' of github.com:jiangyou/test

Conflicts:
	Image.java