Added challenge 3
Added workshop 7
Merge pull request #22 from shovon/master

Added workshop 7