Relative line numbers in vim
Added automatic terminal notifications
Fixed merge conflict