Added 2ndGame(Shape-ish)
Added ResultScreen
Fixed layouts
Merge branch 'master' of https://github.com/timohtey/Memoir.git

Conflicts:
	src/com/example/memoir/QuizPhaseActivity.java
Merge branch 'master' of https://github.com/timohtey/Memoir.git