Shift-Space
Merge branch 'master' of github.com:terraqout/config

Conflicts:
	.vimrc
phpstorm options