Merge branch 'master' of https://github.com/simongondeck/flight-social-network
Merge branch 'master' of https://github.com/simongondeck/flight-social-network
Merge branch 'master' of https://github.com/simongondeck/flight-social-network
status tests pass
photo tests finished
Merge pull request #36 from simongondeck/fix-status

Fix status
Merge pull request #37 from simongondeck/model-test-photos

Model test photos
next
Merge pull request #38 from simongondeck/comment_helper

next
Merge pull request #39 from simongondeck/model-friends

user now has friends
commented out default tests for photo model