rename  directiry "some" to "homepage"
Merge remote-tracking branch 'origin/master'