changed user_cf
Merge branch 'master' of https://github.com/erinkidd01/CS158FinalProject