generic commit
Merge branch 'master' of ssh://github.com/rob-berkes/wikicount

Conflicts:
	output.log