commit schema.rb
Merge branch 'master' of github.com:cintiamh/Voyage
dialogs and floor