another recompile
Merge branch 'master' of github.com:maxtaco/iced-test

Conflicts:
	index.js
	index.map