Merge pull request #10 from brandonkwong/modeltesting

added testing to user model
images showing in collections
Merge pull request #11 from brandonkwong/image_display

images showing in collections
images default to image if broken
Merge pull request #12 from brandonkwong/image_display

images default to image if broken
changed view for merge conflicts