Fixed friend rec function.
Fixed conflict
Merge branch 'master' of github.com:britte/CIS450