final version
Merge branch 'master' of https://github.com/F-J-/HW3

Conflicts:
	bin/AndroidManifest.xml
	bin/classes/com/example/hw3/R$menu.class
	bin/classes/com/example/hw3/R$string.class
	bin/classes/com/example/hw3/R$style.class
	bin/classes/com/example/hw3/R$styleable.class