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

Conflicts:
	tutorial.layout

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