did some stuff
Merge branch 'master' of https://github.com/YRSNorwich/libkoki

Conflicts:
	examples/trigger.py