Merge branch 'master' of github.com:shakyShane/gulp-browser-sync

Conflicts:
	gulpfile-example-proxy.js