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

Conflicts:
	bashrc
Merge branch 'master' of https://github.com/AldenJole/my.user.d