Solved unresolved merge conflict in urgent tasks
Updatet Readme
Merge branch 'master' of https://github.com/KevinThielen/Komana