update .shrc and ubuntu.org
merge