added conflicting file back
Merge pull request #1 from oostenveld/bug1967-mergeconflict

added conflicting file back
Merge branch 'master' of github.com:fieldtrip/fieldtrip
enhancement - use consistent naming of coordsys insread of coordinates for options, see http://bugzilla.fcdonders.nl/show_bug.cgi?id=2114
Merge pull request #14 from oostenveld/bug2114

please pull bug2114