Temp commit before merge
Merge branch 'master' of github.com:etnoy/home

Conflicts:
	.vimrc