tmp
Merge branch 'client_mockup' of github.com:Genshin/emojidex-coffee into client_mockup

Conflicts:
	dist/js/emojidex.min.js
wip