edit gitignore
edited git ignore
Merge branch 'master' into jackbranch
created fieldtrip view
create fieldtrip view