Forced to take newer files, disregarding any merge conflicts

Merging 2013-12-17_adapterboardV2.zip into master fails. Unclear why. But we know we should use the newer files, hence copied them and overruled everything.