Merge pull request #2 from adamtsai/ProfileManagement

added hobby as a class
Included Recommendation Engine and Social Feed class diagrams
add group class diagram
Merge branch 'master' of https://github.com/adamtsai/blackprofessionals_ssad

Conflicts:
	f14_team6.vpp
combined PM,Group,SocialFeed and Rec. Engine class diagrams
post,edit,delete update/post
Merge pull request #5 from adamtsai/aggregate

Aggregate
Aggregating all class diagrams