Displays all usernames at /api/users
Displays filter buttons for each user
testing master
live oauth test passes
package.json
Merge branch 'master' of https://github.com/tcb-hr/feed
Sets username on submitted chats
Merge branch 'master' of https://github.com/tcb-hr/feed
Merge branch 'twinjet' of https://github.com/tcb-hr/feed
Posts/Gets user settings
Refactored filtering to use single $scope.settings object
Sets up filters for new users, adds new users to other users' filters
Indivudual, persistent filter settings!!!
couple of small fixes
more tweaks
Filter preferences for guests
Added check boxes for toggling filters
Merge remote-tracking branch 'origin/master' into userFiltering

Conflicts:
	app/views/partials/main.html
	lib/controllers/users.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/config/auth.js
Merge branch 'master' into userFiltering