update logo, update front pagecopy
pull, fix conflicts