added very basic user-specific squmbl viewing functionality
added very basic user-specific squmbl viewing functionality
added something with follows
Merge branch 'users' of https://github.com/maxwellv/squmblr into users

Conflicts:
	app/controllers/users_controller.rb
Added following functionality, added display for posts by followed users only
removed follow links when signed out, added tests for presence/absence of follow links
did all the easy refactors (everything except the list of followee posts)
Refactoring of user-follow-post relation complete, after multiple heart
attacks and bouts of heartburn
two cleanups in user model and show page
changed the wording on the user show page
Merge branch 'users' of github.com:maxwellv/squmblr into maxwellv-users

* 'users' of github.com:maxwellv/squmblr:
  changed the wording on the user show page
  two cleanups in user model and show page
  Refactoring of user-follow-post relation complete, after multiple heart attacks and bouts of heartburn
  did all the easy refactors (everything except the list of followee posts)
  removed follow links when signed out, added tests for presence/absence of follow links
  Added following functionality, added display for posts by followed users only
  added something with follows
  added very basic user-specific squmbl viewing functionality
  added very basic user-specific squmbl viewing functionality

Conflicts:
	app/views/users/show.html.haml
	config/routes.rb
	db/schema.rb
	spec/features/user_profile_page_spec.rb
Merge branch 'maxwellv-users'

* maxwellv-users:
  changed the wording on the user show page
  two cleanups in user model and show page
  Refactoring of user-follow-post relation complete, after multiple heart attacks and bouts of heartburn
  did all the easy refactors (everything except the list of followee posts)
  removed follow links when signed out, added tests for presence/absence of follow links
  Added following functionality, added display for posts by followed users only
  added something with follows
  added very basic user-specific squmbl viewing functionality
  added very basic user-specific squmbl viewing functionality