add a buttton to follow someone
Merge branch 'master' of github.com:alexcp/horss

Conflicts:
	Gemfile.lock