test commit git cola 2
Merge branch 'master' of https://github.com/evangelion62/blog