added div before user chooses visited planet
moved map down 25px
added styling for my locations
changed styling for nav
styling for planet information
added Raleway font
t push origin masterMerge branch 'adding-solar-system-width'

fixed merge conflict
fixed background positioning
added logo to nav bar
moved nav bar to partial
added render for nav partial
removed nav from application layout
changed root and map path
added landing page before the map and styled
created image assets for web: logo, title, and background nebula
fixed 4 of 5 broken specs
all specs passing
Merge branch 'master' into styling
Resolving merge conflict
Merge branch 'styling'

resolving merge conflict