additional meta stuff
Merge branch 'master' of https://github.com/franklingu/orbital-start

Conflicts:
	second/templates/base1.html