changed time to datetime and parsed and added family names
resolved conflicts
Merge pull request #16 from jghezzi/jasons_branch

Jasons branch