test again —carly
hi chris
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into chris
Added scaling of cell on tap