ActionBar changed
Merge branch 'master' of https://github.com/grammaright/ShowMeTheMoney

Conflicts:
	bin/ShowMeTheMoney.apk
	bin/classes.dex
	bin/classes/com/example/showmethemoney/MainActivity.class
	bin/classes/com/example/showmethemoney/R$id.class
	bin/classes/com/example/showmethemoney/R$layout.class
	bin/classes/com/example/showmethemoney/R$menu.class
	bin/classes/com/example/showmethemoney/R$string.class
	bin/classes/com/example/showmethemoney/R$style.class
	bin/resources.ap_
	gen/com/example/showmethemoney/R.java
	src/com/example/showmethemoney/MainActivity.java
Merge branch 'master' of https://github.com/grammaright/ShowMeTheMoney

Conflicts:
	.gitignore