index
Merge branch 'master' of https://github.com/htphongqn/Newstyle

Conflicts:
	NewStyle/zProgress/css/style.css