before working on mod rewrite
ht access
Merge remote-tracking branch 'origin/master'