Corrected CSS
merge map
merge
More CSS. Created partials
precompiled data
moved images to img directory
turned off turbolinks
precompiled assets
stashing changes before pulling down
merged conflicts with dan's version