quick bashrc fix
Merge branch 'master' of github.com:sojojo/dotfiles
Tried really hard to make the second line of PS1 right aligned. Fixed files.
Merge branch 'master' of github.com:sojojo/dotfiles

Conflicts:
	bashrc

"Merged rocket and lenovo bashrc and other files."
merging with file replace