locale
local
loc
Merge branch 'master' of https://github.com/fred075/-whiiya

Conflicts:
	README.md