衝突の回復うんぬん
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/example/solitonradar/MainActivity.java