no message
no message
#2 fixed
Merge branch 'feature/#2' into develop

Conflicts:
	main.js
	package.json
Merge branch 'develop' of github-private:yuruga/edisonhack into develop

Conflicts:
	main.js