deleted .bash_history
Merge branch 'master' of github.com:fnky/dotfiles

Conflicts:
	.bash_history