checking in before updating
checking in before updating
Merge branch 'master' of https://github.com/nrxus/lifeofres

Conflicts:
	lifeofres/lifeofres/AndroidManifest.xml
	lifeofres/lifeofres/gen/com/example/lifeofres/R.java
	lifeofres/lifeofres/res/layout/activity_main.xml
	lifeofres/lifeofres/src/com/example/lifeofres/MainActivity.java
Merge fix
"merging" Merge branch 'master' of https://github.com/nrxus/lifeofres