Merge remote-tracking branch 'origin/dev' into JAgamecode
Prøvet af fixed merge mellem kode og sound
Fixed settings
Lavet lidt objekter og lavet funktion til fund af højde og brede af
skærm
Tilføjet flere objekter
mus tilføjet
renamed mus fil
lidt objekter ting
Lavet en masse game objekter og skalering + ignore af bin
Lavet MapDivider
asd
asd
Go go
flyttet billeder
asd
Merge branch 'JAgamecode' into dev

Conflicts:
	source/Cars/AndroidManifest.xml
	source/Cars/bin/AndroidManifest.xml
	source/Cars/bin/Cars.apk
	source/Cars/bin/classes.dex
	source/Cars/bin/classes/dk/aau/cs/giraf/cars/GameActivity.class
	source/Cars/bin/classes/dk/aau/cs/giraf/cars/R$drawable.class
	source/Cars/bin/classes/dk/aau/cs/giraf/cars/R$id.class
	source/Cars/bin/classes/dk/aau/cs/giraf/cars/R$layout.class
	source/Cars/bin/classes/dk/aau/cs/giraf/cars/R$menu.class
	source/Cars/bin/classes/dk/aau/cs/giraf/cars/R$string.class
	source/Cars/bin/classes/dk/aau/cs/giraf/cars/R$style.class
	source/Cars/bin/classes/dk/aau/cs/giraf/cars/SettingsActivity.class
	source/Cars/bin/classes/dk/aau/cs/giraf/cars/gamecode/GameObjects/Car.class
	source/Cars/bin/classes/dk/aau/cs/giraf/cars/gamecode/GameThread.class
	source/Cars/bin/classes/dk/aau/cs/giraf/cars/gamecode/GameView.class
	source/Cars/bin/classes/dk/aau/cs/giraf/cars/sound/RecorderThread.class
	source/Cars/bin/resources.ap_
	source/Cars/src/dk/aau/cs/giraf/cars/SettingsActivity.java
	source/Cars/src/dk/aau/cs/giraf/cars/gamecode/GameObjects/Car.java
	source/Cars/src/dk/aau/cs/giraf/cars/gamecode/GameThread.java
	source/Cars/src/dk/aau/cs/giraf/cars/gamecode/GameView.java
	source/Cars/src/dk/aau/cs/giraf/cars/sound/FFT.java
	source/Cars/src/dk/aau/cs/giraf/cars/sound/RecorderThread.java