httpd.conf & htaccess
Merge branch 'master' of https://github.com/boyangwang/wangboyang.com