reomve some love
logos
resolved conflicts
Merge pull request #11 from benheb/master

temp logos