Change colorscheme
Add iterm background picture
Fix merge conflict