Merge pull request #1 from jgable/master

Adding collection view and stuff
swapping prox for lato