Add user following
Remove .DS_Store
Merge branch 'following-users'

Conflicts:
	.DS_Store