first commit
changes
Merge branch 'master' of https://github.com/jirfag/dotfiles

Conflicts:
	.bashrc
	.gitconfig
	.tmux.conf
	.vimrc