Merge branch 'master' of https://github.com/kracekumar/inpycon14 into kracekumar-master
Merge branch 'kracekumar-master'
Merge branch 'master' of https://github.com/iambibhas/inpycon14
Merge branch 'master' of https://github.com/iambibhas/inpycon14
Merge branch 'master' of https://github.com/iambibhas/inpycon14
 faq linked to code of conduct