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

Conflicts:
	javascript/main.js
	javascript/parse.js