didididi
Merge branch 'master' of https://github.com/Franjoo/TedsDream

Conflicts:
	.gradle/1.11/taskArtifacts/cache.properties.lock
	.gradle/1.11/taskArtifacts/fileHashes.bin
	.gradle/1.11/taskArtifacts/fileSnapshots.bin
	.gradle/1.11/taskArtifacts/taskArtifacts.bin
	core/build/libs/core-1.0.jar
	local.properties
integrated new loading screen