merging with mike
Merge branch 'master' of https://github.com/eangeles/wgl

Conflicts:
	partials/teams.html