added logo, committing to merge
Fixed conflicts