updating git ignore
Merge branch 'master' of github.com:devshorts/Playground

Conflicts:
	.gitignore