css bof
Merge branch 'master' of https://github.com/dovotori/ThreeTexture

Conflicts:
	main.js
Revert cab8d5a..b5f8387

This rolls back to commit cab8d5a4122e423b5c3767bf1f88dafc9702fae4.