source bashrc after updating
Fix update.sh
Merge branch 'master'

Conflicts:
	update.sh