Merge remote-tracking branch 'dritter/dritter/solarized_colors'

Conflicts:
	README.md

README.md

@@ -102,6 +102,7 @@ elements (it is by default), and define a `DEFAULT_USER` in your `~/.zshrc`:
 
     export DEFAULT_USER=<your username>
 
+<<<<<<< HEAD
 ### Styling
 
 You can configure the look and feel of your prompt easily with some built-in
@@ -122,6 +123,11 @@ to `light` in your `~/.zshrc`, and you're all set!
 
     POWERLEVEL9K_COLOR_SCHEME='light'
 
+#### Solarized colors
+
+If you want your terminal colors not so bright, you may want to use an alternate 
+color scheme. One of them is "solarized": https://github.com/altercation/solarized
+
 ### Bugs / Contact
 
 If you have any requests or bug reports, please use the tracker in this Github