Merge pull request #3 from gprivera/branch1

Branch1
renamed some fields in database
added sample text file
Merge pull request #4 from gprivera/master

merge