first commit
master commit
master hello world
test rebase
master commit
Merge remote-tracking branch 'github/local_one'

Conflicts:
	class/test/PalmTest.class
	src/test/PalmTest.java
master commit hello world
remote reset
Merge branch 'remote_one' into local_one

Conflicts:
	class/test/PalmTest.class
	src/test/PalmTest.java