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

Conflicts:
	partials/match.html
update for merge