[from now] 2014/10/26 22:19:00

diff --git a/.zshrc b/.zshrc
index e3e1a7d..31abcc2 100644
--- a/.zshrc
+++ b/.zshrc
@@ -305,6 +305,7 @@ alias cp="cp -p"
 alias ld="ls -hl | grep ^d"

 alias screen='screen -U -D -RR'
+alias tmux="if tmux has; then tmux attach; else tmux new; fi"

 # Settings depending on the OSes
 if [ $OSTYPE = "darwin10.8.0" ]; then