add favorite path
add killing history
Merde
Merge remote-tracking branch 'origin/master'