main page ui

main page ui
Merge branch 'master' of https://github.com/bxguan8888/UI-group-project

Conflicts:
	main/css/main.css