added border to profile pic
Merge branch 'Developer-Branch' into designTouchUps2
storyboard
Merge branch 'designTouchUps2' into Developer-Branch

Conflicts:
	FitTogether/fittogethertwo.xcodeproj/project.pbxproj