resolve conflict
Trang 109

Merge branch 'master' of https://github.com/zhilun/GeoQuiz.git

Conflicts:
	bin/R.txt