Apparently I made some change.
Merge branch 'master' of http://github.com/dgentry/myDotfiles

Conflicts:
	bashrc