Adding .htacess back to repository
Added back .htaccess file.
Merge remote-tracking branch 'origin/master'