and simple
& simple
conflict fixed
Merge branch 'master' of github.com:angelaresjun/gitskill
add pwd