blob update
blob update
blob update
blob update
blob update
Merge branch 'master' of https://github.com/AldenJole/my.user.d

Conflicts:
	bashrc
solarized
Merge branch 'master' of github.com:AldenJole/my.user.d
gi'me some purple
color switch
color switch
move prompt
Merge branch 'master' of https://github.com/AldenJole/my.user.d

Conflicts:
	bashrc
rename
massym for shared folder
Merge branch 'master' of https://github.com/AldenJole/my.user.d

Conflicts:
	bashrc
	bashrc.d/linux