maybe now its fixed?
Merge branch 'master' of https://github.com/FRC116/TheScoutingSystem

Conflicts:
	HomePage.html