Working on making card view
Working on making card view
Merge remote-tracking branch 'origin/master'