變更設定ya
Merge branch 'master' of https://github.com/ck520702002/iDoNET

Conflicts:
	templates/main_base.html
Merge branch 'master' of https://github.com/ck520702002/iDoNET