merged from upstream master, added data to gitignore.
Merge pull request #14 from densone/master

added data to gitignore.