寝る前の作業（何したか忘れた）
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/R.txt
	bin/SolitonRadarProject.apk
	bin/classes.dex
	bin/classes/com/example/solitonradar/R$drawable.class
	bin/classes/com/example/solitonradar/R$id.class
	bin/classes/com/example/solitonradar/R$integer.class
	bin/classes/com/example/solitonradar/R$layout.class
	bin/classes/com/example/solitonradar/R$menu.class
	bin/classes/com/example/solitonradar/R$string.class
	bin/classes/com/example/solitonradar/R$style.class
	bin/classes/com/example/solitonradar/R$styleable.class
	gen/com/example/solitonradar/R.java
	res/drawable/circle.png