updating for rebuild
Merge branch 'master' of github.com:Genshin/emojidex-converter

Conflicts:
	Gemfile
	emojidex-converter.gemspec