merging
Merge branch 'master' of github.com:hverespej/TeddyLabs
added logo
fixed merge conflicts