0524 Laura 首頁+註冊頁完成(未加選項)
Merge branch 'master' into Laura

Conflicts:
	css/index.css
	index.php
Merge pull request #4 from l443018/Laura

0524 Laura 首頁+註冊頁完成(未加選項)