Add cd and time alias
Merge conflict in shell.sh; resolved