WIP
Merge branch 'mockup'

Conflicts:
	lib/emojidex/converter.rb
	lib/emojidex/converters.rb