build.gradle changes
minor changes to Procfile, conflicts resolved in index.html