moved aliases to aliases file
Merge branch 'master' of https://github.com/NinaMargrethe/dotfiles