update
Merge branch 'master' of https://github.com/tonysh518/avene_redness

Conflicts:
	css/style.css
	repair.php