add gitignore
Merge remote-tracking branch 'origin' into work

Conflicts:
	vim/.vimrc