+Galaxy.getDistance()
Merge branch 'master' of https://github.com/Datenbankpraktikum2013/MMOG

Conflicts:
	app/models/planet.rb
	app/models/sunsystem.rb
Merge remote branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote branch 'origin/master'
*Galaxy.getDistance mit rotierter Welt