Signed-off-by: JohSpa <JohannesSpangenberg@gmx.de>
Merge branch 'master' of https://github.com/ProjectChaos/Astro.git

Conflicts:
	bin/Debug/tutorial.exe
	include/Planet.h
	main.cpp
	obj/Debug/main.o
	obj/Debug/src/Koord.o
	obj/Debug/src/Planet.o
	src/Planet.cpp
	tutorial.cbp
	tutorial.depend
	tutorial.layout
kdifftest

Signed-off-by: JohSpa <JohannesSpangenberg@gmx.de>