Renamed follow to follow-client
Merge branch 'master' of https://github.com/jargn/app
Merge branch 'master' of https://github.com/jargn/app