inbox message sorted
added logo to website
conflict resolved