fixed a misunderstanding I had with bashrc
Merge remote-tracking branch 'origin/master'

Conflicts:
	bash_profile