glq
Merge remote-tracking branch 'origin/master'

Conflicts:
	gameslogoquiz/index.html
g