finsih!#128

Zifan96 wants to merge 2 commits intocore-methods-in-edm:mastercore-methods-in-edm/assignment7:masterfrom

Zifan96:masterZifan96/assignment7:masterCopy head branch name to clipboard