moved things around
Merge branch 'master' of github.com:ckrotcov/cosmonovich

Conflicts:
	index.html
	main.py
	status.py
some more goodness
joy added