Merge branch 'text' of https://github.com/Berkeley169/fight_Impunity_Haiti into models
added video to model and factory girl specs
added factory girl specs
Merge pull request #17 from Berkeley169/models

Models
Merge pull request #18 from Berkeley169/models

Models
Merge branch 'master' of https://github.com/Berkeley169/fight_Impunity_Haiti into models
merging the latest video work in with th emodel