rounded sqare
Merge remote-tracking branch 'upstream/master'

Conflicts:
	client/index.html
Ignore idea
Merge pull request #2 from kaleigh207/master

round vertical