Merge pull request #1 from kaleigh207/master

Pink square
Started server
use main for main
rounded sqare
Merge remote-tracking branch 'upstream/master'

Conflicts:
	client/index.html
Ignore idea