Merge pull request #13 from Berkeley169/models

another test, playing with merging
Merge pull request #14 from Berkeley169/models

This figures out how to do nested attributes. You can look at the pictur...
having factorygirl automagically create pciture_langs. reflecting these changes in the spec tests