add Test2
 this changes
add test3
Merge branch 'master' into branch-1.0

Conflicts:
	src/com/joyveb/test/Test.java
add this test
Merge branch 'branch-1.0'