Fix messup
Merge branch 'master' of github.com:masterkoppa/fieldtrip.it
Merge the file changes back