overdue checkin's
Merge branch 'master' of https://github.com/jghendricks024/ggl-project

Conflicts:
	header/gg_header_online.html