merged and resolved the conflict in readSpec.m

2 jobs for master in 1 minute and 40 seconds (queued for 1 second)