merge
Merge branch 'master' of https://github.com/eangeles/wgl

Conflicts:
	partials/addmatch.html
updated match page with mike