.emacs cleaned
modified:   rc/.emacs
Small changes
modified:   rc/.emacs
Cheat sheet and new README
Small fix
Dired-mode CS added
git config added
modified:   README.md
new file:   rc/.gitconfig
yasnippet added
modified:   rc/.emacs
Significant updates (snippets,network monitor, cheat sheet)
modified:   docs/CS.tex
modified:   rc/.emacs
modified:   rc/.xmobarrc

New snippets folder!
new file:   snippets/haskell-mode/function
Merge branch 'master' into nyx

Conflicts:
	rc/.emacs
	rc/.xmobarrc