a little editing
Merge pull request #13 from jghezzi/rick

Rick
added user login and a few other details
fixed conflicts
Merge branch 'jeremy_working2'
changed time to datetime and parsed and added family names
a few adjustments; fixed search
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
a few cosmetic changes