Merge branch 'master' of https://github.com/peledies/settings
added line so git uses https instead of git protocol