updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	yuYAPP-html/css/style.css
	yuYAPP-html/home.html
	yuYAPP-html/login.html
change the confliction