gitignore
ScreenSize
Merge branch 'master' of git://github.com/jonasdahl/indaprojekt

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.projects/my-gdx-game-android/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/my-gdx-game-android/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/my-gdx-game-desktop/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/my-gdx-game-desktop/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/my-gdx-game/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/my-gdx-game/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs