added ignore file
Merge branch 'master' of https://github.com/naxxster/dotfiles

Conflicts:
	.gitignore