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
Merge pull request #36 from simongondeck/fix-status

Fix status