Added a google-chrome browser configuration.
Merge branch 'master' of https://github.com/aviramc/.emacs.d

Conflicts:
	settings.el
Merged settings.el