bug fixed
Merge branch 'master' of github.com:midora64/git_tutorial into B_team
finish about_us