following and feed work
following and feed work
week 4: search and gnib-regnib
Merge branch 'master'; commit 'e858cac159ac3089922c5ad05cc67f837b623597'

Conflicts:
	app/views/gnibs/_gnib.html.erb
	app/views/users/show.html.erb
merging kenns and marembos
week 4 marembo commits: Search function for both gnibs and gniblers working, and gniblers following each other. The gnibl modal is up, but awaiting data for population