DOC: Update readme

CHANGELOG.md

 # Next
 
+- Add: add rust code to lektord -> common lib + new repo rs module
+- Add: merge the amadeus-rs prokect into the lektor one
 - Add: add file logging to lektord, the rotate operations are done by lektord to avoid running out of space if someone try to dos lektord...
 - Add: Qt5 module for the player, it's the new default (will replace sdl2!)
 - Add: hook to automatically upgrade the database scheme if needed
@@ -22,11 +24,8 @@
 - Fix: if a kara is not available it will be downloaded even if there is a file on the system (may be filtered out by a user specified URI)
 - Fix: rely on CMake to find OpenMP support for a correct error reporting. OpenMP support is also marked in the README now
 - Fix: no more SEGV when we don't find the module specified in the config file
-<<<<<<< HEAD
 - Fix: properly set LC_NUMERIC to C to avoid SEGV in mpv with module sdl2
-=======
 - Change: now check the timestamp from kurisu and not the mtime from the disk when updating
->>>>>>> 7f1bb66 (DOC: Update changelog)
 - Change: not finding the module specified in a config file is now a fatal error, the error message has been improved
 - Change: no longer set the locale, we only check if the local is an UTF-8 one and abort if it's not
 - Change: all the functions in the command trie have the same signature (less bloat here)