34
Merge branch 'master' of https://github.com/duongtung4691/quizmusic.git

Conflicts:
	ConflictTester/res/values/strings.xml