Merge pull request #2 from magento-hackathon/master

upstream
Update satis.json
Merge pull request #66 from daim2k5/master

Add Project Idea for Mage Hack Shop ;-)