Added Friends Activity
Refined Add Friend Feature
Merge branch 'MyBranch'

Conflicts:
	GroupGoal/res/layout/activity_user_profile.xml
	GroupGoal/res/values/strings.xml
	GroupGoal/src/com/cs121/groupgoal/UserProfileActivity.java
Updated user profile
Merge branch 'master' of https://github.com/nhurwitz/GroupGoal.git