touch simon task
no trials
Update README.md
Update README.md
remove spaces
bisecting_judd
Merge branch 'master' into examples
minor changes, EAR
new logo for runtime
copyright
update example
Merge pull request #4 from expyriment/newlogo

Newlogo
Merge pull request #5 from expyriment/examples

Examples
gitignore
Merge branch 'developing' into select_main_files

Conflicts:
	.gitignore