changed config.assets.compile back to false.
Precompiled assets
Added compass-rails gem
ran bundle. update Gemfile.lock
force version of compass-rails gem
deleted foundation jquery file
fixed merge conflicts