Upgrading ignore file
Merge branch 'master' of github.com:bsnux/sublime-conf

Conflicts:
	.gitignore