blah
"something"
trying to pull
Merge branch 'master' of https://github.com/nrxus/lifeofres

Conflicts:
	lifeofres/lifeofres/bin/AndroidManifest.xml
	lifeofres/lifeofres/res/values/strings.xml
	lifeofres/lifeofres/src/com/example/lifeofres/MainActivity.java
deleted test button