Skrivit lite om asteroider
Merge branch 'master' of github.com:Grulfen/solar

Conflicts:
	doc/rapport.tex