Merge remote-tracking branch 'origin/master' # Conflicts: # server/src/handler.rs
put part of module logic in module.rs