Adding Solarized color scheme
Fixing merge conflict