commit 3

commit 3
Merge branch 'master' of https://github.com/bilegt/Khuushuur

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/Khuushuur.apk
	bin/classes.dex
	bin/classes/com/mks/khuushuur/R$id.class
	bin/classes/com/mks/khuushuur/R$layout.class
	bin/classes/com/mks/khuushuur/R$menu.class
	bin/classes/com/mks/khuushuur/R$string.class
	bin/classes/com/mks/khuushuur/R$style.class
	bin/resources.ap_
	gen/com/mks/khuushuur/R.java
	res/layout/activity_info.xml
	res/layout/activity_main.xml
	res/values/strings.xml
dad

dad
Merge branch 'master' of https://github.com/bilegt/Khuushuur

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/Khuushuur.apk
	bin/classes.dex
	bin/classes/com/mks/khuushuur/R$id.class
	bin/classes/com/mks/khuushuur/R$layout.class
	bin/classes/com/mks/khuushuur/R$menu.class
	bin/classes/com/mks/khuushuur/R$string.class
	bin/classes/com/mks/khuushuur/R$style.class
	bin/resources.ap_
	gen/com/mks/khuushuur/R.java
	res/layout/activity_info.xml
	res/layout/activity_main.xml
	res/values/strings.xml