Add web.config to .gitignore
Updates to file include functions

Updates to file include functions
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore