collection view layout bug squished
ready to pull
Merge remote-tracking branch 'origin/master'