test
ハッカソンの内容をコミット
Merge branch 'master' of ssh://github.com/Shift-Kumagai/Decotte

Conflicts:
	PhotoManipulationApp/bin/PhotoManipulationApp.apk
	PhotoManipulationApp/bin/classes.dex
	PhotoManipulationApp/bin/classes/com/example/photomanipulationapp/R$id.class
	PhotoManipulationApp/bin/classes/com/example/photomanipulationapp/R$layout.class
	PhotoManipulationApp/bin/classes/com/example/photomanipulationapp/R$menu.class
	PhotoManipulationApp/bin/classes/com/example/photomanipulationapp/R$string.class
	PhotoManipulationApp/bin/classes/com/example/photomanipulationapp/R$style.class
	PhotoManipulationApp/bin/classes/com/example/photomanipulationapp/fragment/TopFragment.class
	PhotoManipulationApp/bin/dexedLibs/android-support-v4-e03b5c82b18f21e363c7d1adadd1da1d.jar
	PhotoManipulationApp/bin/resources.ap_
	PhotoManipulationApp/gen/com/example/photomanipulationapp/R.java
	PhotoManipulationApp/res/layout/layout_fragment_draw.xml
	PhotoManipulationApp/src/com/example/photomanipulationapp/fragment/TopFragment.java