Frågor
Merge pull request #60 from Fump/Frågor

Frågor
Fixat buggar i finalQuestion och avslutaknapp
Merge branch 'master' into finalQuestion2
MEEEEEEEEEERGE
Conflicts:
	GameOfNature/gen/se/lth/gameofnature/R.java
Merge branch 'master' into ibbe
IBBE
Conflicts:
	GameOfNature/res/drawable-hdpi/dialog.png
Refactoring
Merge pull request #63 from Fump/Refactoring

Refactoring
Betatest
beta 2
Nya texter till uppgiftspunkterna
Merge pull request #64 from Fump/FrågorTexter

Frågor texter
tog bort kompass
Merge branch 'master' into ibbe
IBBE
Conflicts:
	GameOfNature/res/layout/activity_winner.xml
FIXAT PATRIKS XML BUGGGG
hvscbk