updated ignore files.
updated ignore files.
Merge branch 'merge-server-into-index'

Conflicts:
	StaticServer/.gitignore