update to test2.txt
Merge branch 'master' of github.com:loukilu/android2

Conflicts:
	test2.txt