second window
new layout
Merge branch 'master' of https://github.com/nrxus/lifeofres

Conflicts:
	lifeofres/lifeofres/gen/com/example/lifeofres/R.java
	lifeofres/lifeofres/res/values/strings.xml
	lifeofres/lifeofres/src/com/example/lifeofres/MainActivity.java