Merge pull request #14 from Genshin/collectify_client

small revision to collection
bump
Merge branch 'master' of github.com:Genshin/emojidex-toolkit
semantic fix
Update README.md
wip
Rename category to categories in lib/emojidex/categories
Merge branch 'master' of github.com:Genshin/emojidex-toolkit
Freeze faraday and faraday_middleware dependencies
Fix spec/categories_spec to check for categories instead of category
some annotation
Merge remote-tracking branch 'origin/master' into sources

Conflicts:
	emojidex-toolkit.gemspec
Merge pull request #15 from Genshin/sources

Sources
wip
WIP caching
adjust for png frame folders
working, but needs refinement
Merge pull request #16 from Genshin/master

Merge pull request #15 from Genshin/sources
Merge pull request #17 from Genshin/sources

Sources
Merge pull request #1 from emojidex/master

Master