local
remote reset
Merge branch 'remote_one' into local_one

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