Update gitignore
Merge branch 'master' of github.com:mscreations/config

Conflicts:
	.gitignore