TestClass.javaの追加
Merge commit 'fb138c8b170083bceb815fc84dd51bd2e2b92459' into testkoma1
Merge branch 'testkoma2' into testkoma1
ブランチ１が更新
ブランチ２が更新
競合の解消

Merge branch 'testkoma2'

Conflicts:
	TeamTest/src/jp/co/dmp/android/teamtest/MainActivity.java