Merge pull request #19 from shovon/master

Added the code the was worked on live
Added workshop 6.