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

Conflicts:
	index.html
fixed merge issues