merger
conflict resolved
Merge branch 'master' of https://github.com/stariqmi/katibeen