first commit
Merge branch 'master' of github.com:shtemaran/hangman

Conflicts:
	bin/Hangman2.apk
	bin/classes.dex
	bin/classes/com/example/hangman2/MainActivity$1.class
	bin/classes/com/example/hangman2/MainActivity$2.class
	bin/classes/com/example/hangman2/MainActivity.class
	bin/classes/com/example/hangman2/MenuActivity.class
	bin/classes/com/example/hangman2/R$drawable.class
	bin/classes/com/example/hangman2/R$id.class
	bin/classes/com/example/hangman2/R$layout.class
	bin/classes/com/example/hangman2/R$menu.class
	bin/classes/com/example/hangman2/R$string.class
	bin/classes/com/example/hangman2/R$style.class
	bin/classes/com/example/hangman2/R$styleable.class
	bin/classes/com/example/hangman2/YouLostDialog.class
	bin/resources.ap_
	gen/com/example/hangman2/R.java
	res/layout/activity_main.xml
	res/layout/activity_menu.xml
	res/layout/activity_you_lost_dialog.xml
	res/values/button_style.xml
	res/values/strings.xml
	src/com/example/hangman2/MainActivity.java
	src/com/example/hangman2/MenuActivity.java
tmp