I think we're close to done on my end.
Merge branch 'master' of https://github.com/zhangoliver7/Per6-Zhang-Chu-Hu-AdvanceWars