picasso and retrieving friends with pic urls
Merge remote-tracking branch 'origin/master' into fb_1

Conflicts:
	app/app.iml
	app/src/main/java/com/example/satyinalive/app/ContactActivity.java
	app/src/main/java/com/example/satyinalive/app/MainActivity.java
Merge remote-tracking branch 'origin/master' into fb_1
Merge
Merge remote-tracking branch 'origin/master' into fb_1
Merge pull request #2 from AayushiK/fb_1

Fb 1