new data
fixed data merges
Merge pull request #86 from cicadas-2014/data

Data