main slider
Merge branch 'master' of https://github.com/zhenos/WebUIProject-3rdSemester

Conflicts:
	Ver1.0/mainPage/main.html
	Ver1.0/mainPage/static/index.js