updated bashrc
Merge branch 'master' of github.com:osheadavid7/config_files

Conflicts:
	.bashrc
updated init.el
added default dict
added alias for magit and deleted duplicate alias from divergence
updated .bashrc