sass
update
gem update
remove commented out section
conflict resolution
JS kits fix
commit