song detail update
resolving conflict
fix gitignore
Resolved conflicts, fuck the CRLF