branch test
Merge branch 'feature'

Conflicts:
	orehara/res/layout/activity_main.xml