Changed a log so I can merge
Merge branch 'master' of https://github.com/kfreedland/CS169GAP
Partial commit so I can merge
Merge branch 'master' of https://github.com/kfreedland/CS169GAP
Fixed some tests and comments use userID not username