Some message
Merge branch 'master' of https://github.com/KirMerzlikin/TEST

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes/com/example/testr/R$layout.class
	bin/classes/com/example/testr/R$menu.class
	bin/classes/com/example/testr/R$string.class
	gen/com/example/testr/R.java
	res/values/strings.xml