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

temp logos
new ui
Merge remote-tracking branch 'upstream/master'
Merge pull request #12 from benheb/master

UI
messing with logos
messing with logos