Jekyll Init
Merge branch 'master' of github.com:eberthaut/satellites

Conflicts:
	.gitignore