Planets list
Merge branch 'task3' of github.com:bergquist/devnull into task3

Conflicts:
	slm/task2/star.js