tmuxinator test
Merge branch 'master' of github.com:raulmpad/.dot_files

Conflicts:
	.vimrc