fix merge
Merge branch 'master' of ssh://github.com/edina/fieldtrip-example