adds and removes to get master branch up to date
changes picture to the connecting banner
fixes merge conflict