change bashrc
meregd
Merge branch 'master' of github.com:tluna/tluna

Conflicts:
	bashrc