commit
Merge pull request #204 from SatishTalim/master

commit - minor
commit
Merge pull request #206 from SatishTalim/master

commit workshop changes
Merge branch 'master' of github.com:gopherconindia/gopherconindia.github.io
Merge branch 'master' into issue_43