change name and email
change name and email
change name
Merge branch 'master' of github.com:Orion7/git_12