Added Thor to create_data
Merge Conflicts
Added command line options to create_data.rb
Fixed merge conflicts in README
Merge pull request #2 from derekdowling/Victoria

Merging Victoria's branch with Master