bundle update
modify Gemfile
bundle update
insignificant change
mv Procfile to Procfile.development
obfuscate Procfile
obfuscate Procfile
restore Procfile
restore python scripts
fix puma start command in Procfile
Merge branch 'develop'
add admin
resolve conflicts