Merging branch addfriendMerge into master branch.
These don't belong in the repo.