fix main.js structure
Merge branch 'master' of https://github.com/yuvalmit/TsamidShenkar

Conflicts:
	javascript/main.js