edit asset.compile = true
finished once
add num
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md