move html to root of www tree
fix merge conflict
Merge branch 'master' of ssh://github.com/edina/fieldtrip-open
remove html that is generated from source control