example
Merge branch 'callback' of github.com:expyriment/expyriment into callback

Conflicts:
	expyriment/callback_functions.py