adds attr_readers to the video format
Fixes a typo
Bump to JSON 1.8
Merge pull request #201 from bodrovis/master

Bump to JSON 1.8
Merge pull request #200 from micmmakarov/master

Fixes a typo
Add fields :author and :videos_count to Playlist Model

Signed-off-by: Aymeric Brisse <aymeric.brisse@perfect-memory.com>
Merge branch 'master' into add-readers-to-video-format
Merge pull request #209 from rhodrid/add-readers-to-video-format

Adds attr_readers to the video format
Merge pull request #205 from PerfectMemory/playlist-add-fields

Add fields :author and :videos_count to Playlist Model
bump faraday dependency
Merge pull request #214 from dimelo/faraday-dependency

bump faraday dependency
merge
remove accidentally checked in git diff from conflict