Automated Commit
Merge branch 'master' of github.com:raphdu57/dotfiles

Conflicts:
	bash/.bash_history
	vimperator/.vimperator/info/default/history-command
	vimperator/.vimperator/info/default/local-marks
Merge branch 'master' of github.com:raphdu57/dotfiles

Conflicts:
	bash/.bash_history
	vimperator/.vimperator/info/default/history-command
	vimperator/.vimperator/info/default/local-marks
Merge branch 'master' of github.com:raphdu57/dotfiles
Automated Commit