4 spaces as indenting for scss files
Add splitjoin plugin
Update vimrc
Update screenshot
test merge