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

Conflicts:
	main.cpp

Signed-off-by: Philmaweb <philmaweb@gmail.com>