add htaccess
Merge branch 'master', remote-tracking branch 'remotes/github/master'