gemfile
Merge branches 'master', 'master' and 'master' of github.com:PareidoliaX/ProjectNightMeta
gemfile, database config