user page contains fleet feed
resolved merge conflicts
Merge branch 'master' of https://github.com/vyash8/Flitter