Ignore web.config
Merge branch 'gh-pages' of https://github.com/knu2xs/whitewater into gh-pages

Conflicts:
	.gitignore
Ignore web.config
Merge branch 'gh-pages' of https://github.com/knu2xs/whitewater into gh-pages
Ignore web.config
Merge branch 'gh-pages' of https://github.com/knu2xs/whitewater into gh-pages