edited add friend
Merge branch 'master' of https://github.com/coreynagel/software_methods_project