.
Merge branch 'master' of https://github.com/proller/home

Conflicts:
	.bashrc
 .