画面また修正
Merge branch 'master' of https://github.com/TechCAMP2013/cyber
Merge branch 'master' of https://github.com/TechCAMP2013/cyber
Merge branch 'master' of https://github.com/TechCAMP2013/cyber
aa
Merge branch 'master' of https://github.com/TechCAMP2013/cyber
aaa
Merge branch 'master' of https://github.com/TechCAMP2013/cyber
＞＜
Merge branch 'master' of https://github.com/TechCAMP2013/cyber

Conflicts:
	bin/Manga4.apk
	bin/classes.dex
	bin/classes/ya/example/manga4/DrawActivity.class
	bin/classes/ya/example/manga4/LoginActivity.class
	bin/classes/ya/example/manga4/R$dimen.class
	bin/classes/ya/example/manga4/R$drawable.class
	bin/classes/ya/example/manga4/R$id.class
	bin/classes/ya/example/manga4/R$layout.class
	bin/classes/ya/example/manga4/R$menu.class
	bin/classes/ya/example/manga4/R$string.class
	bin/classes/ya/example/manga4/R$style.class
	bin/classes/ya/example/manga4/R.class
	bin/resources.ap_
	src/ya/example/manga4/TopActivity.java
太さ
Merge branch 'master' of https://github.com/TechCAMP2013/cyber

Conflicts:
	bin/classes/ya/example/manga4/DrawModeActivity.class
	bin/classes/ya/example/manga4/LoginActivity$DecideClickListener.class
	bin/classes/ya/example/manga4/LoginActivity$HowtoClickListener.class
	bin/classes/ya/example/manga4/LoginActivity.class
	bin/classes/ya/example/manga4/R$id.class
	bin/classes/ya/example/manga4/R$layout.class
	bin/classes/ya/example/manga4/R$menu.class
	bin/classes/ya/example/manga4/R$string.class
	bin/classes/ya/example/manga4/R$style.class
	src/ya/example/manga4/DrawView.java