Git alias to wrap merging with stashing
i3lock instead of gnome-screensaver-command
monitor on the left
Fix git aliases