ran rake assets precompiler
testing precompiler in application.css to include vendor css files
moving vendor files to assets
getting ready to update heroku
updating local master repository for deployment
Fix merge conflict