Adds the basic layout of Z-2
Merge pull request #6527 from BlueFishie/deck2-fish

Adds the basic layout of Z-2
Merge pull request #1 from Baystation12/kunpeng

Kunpeng