do
do
Merge branch 'master' of git://github.com/bogdan/dotbash

Conflicts:
	.gitignore
Merge branch 'master' of git://github.com/bogdan/dotbash
do