iroiro tuika
Merge branch 'master' of github.com:gen0e0/dotfiles

Conflicts:
	.vimrc