Added test data generation
Merge branch 'master' of github.com:asharma93/hackathon-app
Added gitignore to help merge conflicts