lala
Merge branch 'master' of https://github.com/nrxus/lifeofres

Conflicts:
	lifeofres/lifeofres/gen/com/example/lifeofres/R.java