add team mascot
Merge remote-tracking branch 'origin/develop' into frontend
Merge remote-tracking branch 'origin/develop' into frontend
add a few frontend files
Merge branch 'frontend' into develop

Conflicts:
	public/index.html