several astroids, moving somewhat randomly
print xyz for accelarator
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore