Reformatting bashrc
Merge branch 'master' of github.com:JohnMorales/dotfiles

Conflicts:
	bashrc