edit README.md
Merge branch 'master' of github.com:laheadle/tournabox

Conflicts:
	README.md