readme added
code added
Update README.md
Update README.md
code added
Update README.md
Update README.md
Added Widget block
added netbeans project to gitignore
Merged 2.0.1 to master, fixed merge problems
Merge pull request #1 from svenvarkel/master

Added Widget block
Merge remote-tracking branch 'buric/master'

* buric/master:
  added netbeans project to gitignore
  Added Widget block
  Update README.md
  Update README.md
  code added
  Update README.md
  Update README.md
  code added
  readme added

Conflicts:
	README.md
	app/code/community/Inchoo/FeaturedProducts/Block/Adminhtml/Edit.php
	app/code/community/Inchoo/FeaturedProducts/Block/Adminhtml/Edit/Grid.php
	app/code/community/Inchoo/FeaturedProducts/README.txt
	app/code/community/Inchoo/FeaturedProducts/etc/config.xml