Updated .gitignore
Updated gitignore
Updated the .htaccess
Merge branch 'master' of github.com:benargo/atwd