resolving conflicts
resolving conflicts
Merge pull request #10 from annajordanous/master

Code rewritten for large-scale data collection.