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

Conflicts:
	main.cpp
	tutorial.depend
	tutorial.layout

Merge nach der großen Pause
Merge branch 'master' of https://github.com/ProjectChaos/Astro.git

Conflicts:
	main.cpp
	tutorial.depend
	tutorial.layout

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