change
Merge branch 'master' of https://github.com/tienbrowan/test

Conflicts:
	TeamBGitTester/src/com/example/teambgittester/MainActivity.java