tien
Fied conflic

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

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