Procfile, config updated
update gems, including puma
performance improvements
fix merge conflicts