changed the bashrc and merge some alias
edit the promt with git function inside, also change to solarized