added _variables css to application.css
copy changes
merge fix