Created config for proxy. See https://github.com/development-team/2/blob/master/doc/FAQ.md for more info
Merge remote-tracking branch 'origin/master'