Merge branch 'master' of github.com:simongondeck/flight-social-network i...

...nto quy-migration