Added temp logo.
Fixed merge conflicts.