new layout
Merge branch 'master' of github.com:DeltaWhy/cs4464-project3

Conflicts:
	frontend/index.html