//added CONTRIBUTING.md CONTRIBUTORS.md README.md
// .DS_Store files added to .gitignore
//updated CONTRIBUTING.md & CONTRIBUTORS.md thanks to @all
Add cache on BlockRss
Merge branch 'development' of https://github.com/MrManchot/PrestaShop into development

Conflicts:
	modules/blockrss/blockrss.php
 cc