re-fixing the picture spec, adding some files to use with spec testing
Merge branch 'master' of github.com:Berkeley169/fight_Impunity_Haiti