filter model 1.0 added
Merge branch 'master' of https://github.com/berkeley-cocosci/vanessa-luke-marbles

I hope this merge doesn't screw things up... I backed up the pre-merge files on my end...