Attempting to fix sizing issues
Merge branch 'master' of https://github.com/conradhappeliv/facesofleague

Conflicts:
	server/index.html