got submission of data finally, fffffffff
some minor changes
merging changes from master
Merge pull request #8 from cjord01/merge_conflict

Merge conflict