removing files folder. Again
Modified gitignore
Merge branch 'master' into dev
Removed httaccess from git