Last commit before merging MASTER
Merge branch 'master' into Jons-Branch

Conflicts:
	TeamPage.html
Clean
Merge branch 'Jons-Branch'