added google plus in footer
resolved local conflict