hoge
Merge branch 'master' of https://github.com/ymatsuza/TequeezApp

Conflicts:
	src/jp/ne/sakura/ymatsuza/tequeezapp/QuizActivity.java