small changes
Merge branch 'master' of github.com:AtulanZaman/HealthyEatingApp

Conflicts:
	Documents/Assign#2/Assignment#2.docx
Merge branch 'master' of github.com:AtulanZaman/HealthyEatingApp
Merge branch 'master' of github.com:AtulanZaman/HealthyEatingApp
Merge branch 'master' of github.com:AtulanZaman/HealthyEatingApp
changed SocialMedia.java
Merge branch 'master' of github.com:AtulanZaman/HealthyEatingApp
Added GetFriendsPoints function
Merge branch 'master' of github.com:AtulanZaman/HealthyEatingApp
added a bunch of stuff