Changes
modified:   rc/.bashrc
modified:   rc/.emacs
modified:   rc/.xmonad/xmonad.hs
Merge branch 'master' of github.com:agomezl/.conf