Merge branch 'devel' into add_otsuka
画像を当てる画面の追加
Merge branch 'devel' into add_otsuka

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
test
最新版
最新版
画像を当てる画面
最新版
Merge branch 'add_otsuka' into devel

Conflicts:
	src/com/example/drawingshiritori/DrawSurfaceView.java
	src/com/example/drawingshiritori/DrawingActivity.java
	src/com/example/drawingshiritori/Globals.java