Sunday, 04. August 2013
Updated .emacs. Added bash config
Merge branch 'master' of github.com:shermpay/Local-Config

Conflicts:
	README.md