tiny changes
Merge branch 'master' of https://github.com/paperManu/123DMelt

Conflicts:
	src/js/main.js