*Galaxies View Dynamic
Merge remote branch 'origin/master'
Merge remote branch 'origin/master'
Merge remote branch 'origin/master'
Merge remote branch 'origin/master'

Conflicts:
	db/seeds.rb
Merge remote branch 'origin/master'
Merge remote branch 'origin/master'
*generating World