test
Merge branch 'master' of https://github.com/avoorhis/vamps_rails_app
minor adjustments to db schema