test1
Merge remote-tracking branch 'origin/1.0.0.1'

Conflicts:
	src/com/test/me/GoNow.java