Beginning CS
Merge branch 'master' of github.com:marter/.dotfiles