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

Conflicts:
	js/controllers/MatchController.js
added image and links to match page