changes
Merge branch 'berno' of https://github.com/bernokl/home into berno

Conflicts:
	.bash_aliases