Getting everything synchronized.
Getting everything synchronized.
Merge branch 'master' of https://github.com/knu2xs/whitewater
Getting everything synchronized.
Merge branch 'master' of https://github.com/knu2xs/whitewater
Merge branch 'gh-pages' of https://github.com/knu2xs/whitewater into gh-pages

Conflicts:
	.gitignore