Update Text
Merge branch 'master' of github.com:9gix/the-spacecons

Conflicts:
	spacecon/templates/index.html
Merge branch 'master' of github.com:9gix/the-spacecons
Fix HTML tag missing Error