edit by mac
Merge branch 'master' of github.com:github-sprint3r/gosoft_group_02