Remove unneeded commentted out code.
Update logic behind people that a user is following.
Merge pull request #15 from Cheerazar/nil_id

Hope this works
Merge branch 'master' into logout

Conflicts:
	app/controllers/index.rb
	app/models/following.rb