update
delete
Merge branch 'master' of https://github.com/oshai/yami

Conflicts:
	compiled_classes/yami/version.properties