conf not conference
Merge pull request #22 from codeaholicshk/conf-not-conference

conf not conference