translation over, still need to review
reviewer
translated
Merge pull request #174 from l3b2w1/master

translated