Merge branch 'master' into issue_157
Merge branch 'issue_157' of github.com:Qwinix/gopherconindia.github.io into issue_157
Merge pull request #174 from Qwinix/issue_157

Merge branch 'master' into issue_157