Add fixtures dir, add gorilla image.
Fix merge conflicts.
Merge pull request #34 from cassiemoy/cassie

Cassie