Update names.json
Conflicts. Conflicts everywhere.
Merge pull request #17 from stevenght/flamekaizar-patch-1

Flamekaizar patch 1