Initial commit
Merge branch 'master' of https://github.com/Thatar/Planetary

Conflicts:
	.gitignore