Merge branch 'master' of
ssh://git@github.com/AndroidFriendsTeam/AFT_Test_Synchro.git

Conflicts:
	test.txt
Merge branch 'master' of
ssh://git@github.com/AndroidFriendsTeam/AFT_Test_Synchro.git