adds tmux pane switching shortcuts
adds conflict command
adds new alias for github
changes path
adds tmux switch