added filtering on keywords
fix merge conflict
fix merge conflict
Merge branch 'master' of https://github.com/ask-ing/asking