reordered
Merge branch 'master' of https://github.com/thm/uinames

Conflicts:
	names.json