fixed scroll error
Merge branch 'master' of https://github.com/Tomson-Wang/shuflr-new-site

Conflicts:
	.idea/workspace.xml
	css/main.css
	index.html
	js/control.js