Fixat haxxorbuggen
Merge branch 'master' of https://github.com/Fump/GameOfNature.git

Conflicts:
	GameOfNature/res/values/strings.xml