fix main.js
Merge branch 'develop' of github.com:yuruga/edisonhack into develop

Conflicts:
	main.js