time to resolve conflicts lol
Merge branch 'master' of https://github.com/edahlseng/worldmatrix

Conflicts:
	ui.js