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

Jasons branch
Merge pull request #15 from jghezzi/jeremy_working

a few adjustments; fixed search
working on authentication and authorization