Update README.md
Merge branch 'dev'
version bump
dev merge
conflicts
Merge branch 'dev'
Merge branch 'dev'
removed unnecessary log
Merge branch 'dev'
version bump
conflicts
Update README.md
conflicts
Merge branch 'master' of https://github.com/wturyn/silly-tv-framework
Update README.md
Revert "Update README.md"

This reverts commit c41e25d91226b23f978ab6bddc9bf8ebb05f2d9a.
readme
Merge branch 'dev'
Merge branch 'dev'
version bump