(cleanup) merging conflicts
Merge branch 'master' of https://github.com/jonsadka/logos