Delete test commit
Test commit
Merge branch 'LasseLegaard'

Conflicts:
	AndroidManifest.xml
Merge branch 'ToreKjaer'

Conflicts:
	AndroidManifest.xml
Update
Init
Init
Update Layout: Activity_new_game, waiting for players
manifest
Merge branch 'ToreKjaer'
Merge branch 'ChristianSkyumLarsen'

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
Merge commit

Fixed conflicting merges
Merge branch 'master' into ToreKjaer