No idea, just found changes in directory
Merge branch 'master' of github.com:jdmack/gsl-tracker

Conflicts:
	index.html