thay doi 2 file activity and string
Merge branch 'master' of https://github.com/tienbrowan/test

Conflicts:
	TeamBGitTester/res/values/strings.xml
	TeamBGitTester/src/com/example/teambgittester/MainActivity.java