Gjorde en liten snabb test intro sequence till appen
Merge branch 'master' into Test
Fixat R konflikt

Conflicts:
	GameOfNature/gen/se/lth/gameofnature/R.java