some js
Merge branch 'master' of https://github.com/MultimediaOn10/t3confinal

Conflicts:
	js/main.js
fixed numbers in index