Merge pull request #11 from benheb/master

temp logos
new ui
Merge remote-tracking branch 'upstream/master'